moved image codecs' headers to the respective subdirectories; allow t…

…he user to use system zlib.
chenbk85 · Apr 26, 2011 · 6985540 · 6985540
1 parent 0e0929a
commit 6985540
Show file tree

Hide file tree

Showing 41 changed files with 1,603 additions and 8,454 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(zlib)
+if(NOT ZLIB_FOUND)
+    add_subdirectory(zlib)
+endif()
 if(WITH_JASPER AND NOT JASPER_FOUND)
     add_subdirectory(libjasper)
 endif()

diff --git a/3rdparty/include/jasper/jas_cm.h b/3rdparty/include/jasper/jas_cm.h