Commit Graph

23 Commits

Author SHA1 Message Date
Konstantin Käfer
55ef14f3a8 compress_png: void* => const void* 2015-07-08 19:45:59 +02:00
Konstantin Käfer
f4707f72e0 Replace mbgl::util::make_unique<> with std::make_unique<> 2015-05-26 17:57:38 +02:00
Thiago Marcos P. Santos
124b49562d Get rid of printf and cout by using Log::*
Use our logging system that will route the message accordingly on
the target platform.

Fixes #613
2015-03-12 14:19:32 +02:00
Leith Bade
94d34ce7ac Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/map/map.cpp
2014-12-03 22:02:55 +11:00
Konstantin Käfer
82f3574d09 add array overloads to make_unique and move it to mbgl::util from std 2014-12-03 11:27:24 +01:00
Leith Bade
8ae2cd3985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp
2014-11-28 01:51:21 +11:00
artemp
fc805cc41c image-readers: move concrete implementations headers into platform/default 2014-11-28 00:15:04 +11:00
artemp
8c524e1ac6 return unique_ptr from get_image_reader 2014-11-28 00:15:04 +11:00
artemp
a2a303a1d1 ensure all exceptions are caught in Image ctor 2014-11-28 00:15:04 +11:00
artemp
ae2d4e740e add image_reader abstraction layer to hanfle multiple image formats
(work-in-progress)
2014-11-28 00:14:11 +11:00
artemp
84551d9349 convert image_reader public interface to use CamelCase to match the rest of codebase 2014-11-26 17:50:12 +01:00
artemp
f89c9753dd image-readers: move concrete implementations headers into platform/default 2014-11-19 16:56:53 +01:00
artemp
04cea00d5d return unique_ptr from get_image_reader 2014-11-19 16:31:16 +01:00
artemp
f7e813238d ensure all exceptions are caught in Image ctor 2014-11-19 16:17:52 +01:00
Leith Bade
d957d65bef Enable PNG gamma 2014-11-16 23:35:15 +11:00
artemp
782a0be4bf Merge branch 'master' into image-readers 2014-11-13 15:46:11 +00:00
Leith Bade
0dd54c0379 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	platform/default/image.cpp
2014-11-12 23:16:56 +11:00
Konstantin Käfer
27cf24171a check library versions against header symbols in static initialization function
fixes #580
2014-11-12 12:12:01 +01:00
Leith Bade
f01428b697 Work around gamma crash 2014-11-08 02:14:53 +11:00
Leith Bade
598bc92401 Make image.cpp use Log functions 2014-11-08 01:05:03 +11:00
artemp
f42d39dc6e add image_reader abstraction layer to hanfle multiple image formats
(work-in-progress)
2014-11-07 11:49:31 +00:00
Konstantin Käfer
592ed57d09 use more modern libpng version instead of the system-provided one and fix compile errors 2014-10-30 12:40:16 -07:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00