projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
efaefa2
)
[trunk] split into two config files config options related to the lib and to the...
author
Mickael Savinaud
<savmickael@users.noreply.github.com>
Sun, 3 Mar 2013 17:55:35 +0000
(17:55 +0000)
committer
Mickael Savinaud
<savmickael@users.noreply.github.com>
Sun, 3 Mar 2013 17:55:35 +0000
(17:55 +0000)
CMakeLists.txt
patch
|
blob
|
history
src/bin/common/CMakeLists.txt
patch
|
blob
|
history
src/bin/common/color.c
patch
|
blob
|
history
src/bin/common/opj_apps_config.h.cmake.in
[new file with mode: 0644]
patch
|
blob
src/bin/jp2/CMakeLists.txt
patch
|
blob
|
history
src/bin/jp2/convert.c
patch
|
blob
|
history
src/bin/jp2/opj_compress.c
patch
|
blob
|
history
src/bin/jp2/opj_decompress.c
patch
|
blob
|
history
src/lib/openjp2/opj_config.h.cmake.in
patch
|
blob
|
history
tests/CMakeLists.txt
patch
|
blob
|
history
tests/comparePGXimages.c
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 4c7c825ce5e0533282de47c0c3fb118ae0bf9355..483cc24286f6daa2011b033c947613a1d3fc51dd 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-180,7
+180,7
@@
if(CMAKE_COMPILER_IS_GNUCC)
endif()
#-----------------------------------------------------------------------------
endif()
#-----------------------------------------------------------------------------
-# opj_config.h generation
(1/2)
+# opj_config.h generation
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
@@
-197,6
+197,12
@@
CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
include(TestLargeFiles)
OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
include(TestLargeFiles)
OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
+ @ONLY
+ )
+
#-----------------------------------------------------------------------------
# Build Library
add_subdirectory(src)
#-----------------------------------------------------------------------------
# Build Library
add_subdirectory(src)
@@
-226,14
+232,6
@@
if(BUILD_CODEC OR BUILD_MJ2)
endif ()
add_subdirectory(wrapping)
endif ()
add_subdirectory(wrapping)
-#-----------------------------------------------------------------------------
-# opj_config.h generation (2/2)
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
- @ONLY
- )
-
#-----------------------------------------------------------------------------
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
#-----------------------------------------------------------------------------
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
diff --git
a/src/bin/common/CMakeLists.txt
b/src/bin/common/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bb07ba7c00106176c67c6d0d56f16676ecbf9e08 100644
(file)
--- a/
src/bin/common/CMakeLists.txt
+++ b/
src/bin/common/CMakeLists.txt
@@
-0,0
+1,7
@@
+#-----------------------------------------------------------------------------
+# opj_apps_config.h generation
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_apps_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/opj_apps_config.h
+ @ONLY
+ )
\ No newline at end of file
diff --git
a/src/bin/common/color.c
b/src/bin/common/color.c
index a71b74106cc33a2f9de3a9893655eebfd2963de9..ce9ccde3f47526b1ef62cb430ca28c453984f87e 100644
(file)
--- a/
src/bin/common/color.c
+++ b/
src/bin/common/color.c
@@
-34,14
+34,14
@@
#include <stdlib.h>
#include <math.h>
#include <stdlib.h>
#include <math.h>
-#include "opj_config.h"
+#include "opj_
apps_
config.h"
#include "openjpeg.h"
#include "color.h"
#include "openjpeg.h"
#include "color.h"
-#ifdef HAVE_LIBLCMS2
+#ifdef
OPJ_
HAVE_LIBLCMS2
#include <lcms2.h>
#endif
#include <lcms2.h>
#endif
-#ifdef HAVE_LIBLCMS1
+#ifdef
OPJ_
HAVE_LIBLCMS1
#include <lcms.h>
#endif
#include <lcms.h>
#endif
diff --git a/src/bin/common/opj_apps_config.h.cmake.in
b/src/bin/common/opj_apps_config.h.cmake.in
new file mode 100644
(file)
index 0000000..
4ea1efa
--- /dev/null
+++ b/
src/bin/common/opj_apps_config.h.cmake.in
@@ -0,0
+1,13
@@
+/* create opj_apps_config.h for CMake */
\r
+
\r
+#cmakedefine OPJ_HAVE_LIBPNG @HAVE_LIBPNG@
\r
+#cmakedefine OPJ_HAVE_PNG_H @HAVE_PNG_H@
\r
+#cmakedefine OPJ_HAVE_LIBTIFF @HAVE_LIBTIFF@
\r
+#cmakedefine OPJ_HAVE_TIFF_H @HAVE_TIFF_H@
\r
+
\r
+#cmakedefine OPJ_HAVE_LIBLCMS1
\r
+#cmakedefine OPJ_HAVE_LIBLCMS2
\r
+#cmakedefine OPJ_HAVE_LCMS1_H
\r
+#cmakedefine OPJ_HAVE_LCMS2_H
\r
+
\r
+
\r
diff --git
a/src/bin/jp2/CMakeLists.txt
b/src/bin/jp2/CMakeLists.txt
index aee330a596048f512b885f4082a300c2dc3e6c34..4374631743a69204380add3bbaf8a8eb00bc3b52 100644
(file)
--- a/
src/bin/jp2/CMakeLists.txt
+++ b/
src/bin/jp2/CMakeLists.txt
@@
-11,6
+11,7
@@
set(common_SRCS
# Headers file are located here:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
# Headers file are located here:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+ ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME}
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME}
diff --git
a/src/bin/jp2/convert.c
b/src/bin/jp2/convert.c
index 98d900adebd0533d078a09aeac252758ae00534c..1b6e688b6256699ca5aa7740c225644095e2637a 100644
(file)
--- a/
src/bin/jp2/convert.c
+++ b/
src/bin/jp2/convert.c
@@
-29,21
+29,21
@@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opj_config.h"
+#include "opj_
apps_
config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#ifdef HAVE_LIBTIFF
+#ifdef
OPJ_
HAVE_LIBTIFF
#include <tiffio.h>
#include <tiffio.h>
-#endif /* HAVE_LIBTIFF */
+#endif /*
OPJ_
HAVE_LIBTIFF */
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
#include <zlib.h>
#include <png.h>
#include <zlib.h>
#include <png.h>
-#endif /* HAVE_LIBPNG */
+#endif /*
OPJ_
HAVE_LIBPNG */
#include "openjpeg.h"
#include "convert.h"
#include "openjpeg.h"
#include "convert.h"
@@
-2074,7
+2074,7
@@
int imagetopnm(opj_image_t * image, const char *outfile)
return 0;
}/* imagetopnm() */
return 0;
}/* imagetopnm() */
-#ifdef HAVE_LIBTIFF
+#ifdef
OPJ_
HAVE_LIBTIFF
/* -->> -->> -->> -->>
TIFF IMAGE FORMAT
/* -->> -->> -->> -->>
TIFF IMAGE FORMAT
@@
-2795,7
+2795,7
@@
opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
}/* tiftoimage() */
}/* tiftoimage() */
-#endif /* HAVE_LIBTIFF */
+#endif /*
OPJ_
HAVE_LIBTIFF */
/* -->> -->> -->> -->>
/* -->> -->> -->> -->>
@@
-3085,7
+3085,7
@@
int imagetorawl(opj_image_t * image, const char *outfile)
return imagetoraw_common(image, outfile, OPJ_FALSE);
}
return imagetoraw_common(image, outfile, OPJ_FALSE);
}
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
#define MAGIC_SIZE 8
#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
#define MAGIC_SIZE 8
@@
-3624,4
+3624,4
@@
fin:
return fails;
}/* imagetopng() */
return fails;
}/* imagetopng() */
-#endif /* HAVE_LIBPNG */
+#endif /*
OPJ_
HAVE_LIBPNG */
diff --git
a/src/bin/jp2/opj_compress.c
b/src/bin/jp2/opj_compress.c
index 24217aa3de7af8d4d1a96947697c4ab88dbac98c..71e767b5418de9a6c46ade90e63bb85a40ad4062 100644
(file)
--- a/
src/bin/jp2/opj_compress.c
+++ b/
src/bin/jp2/opj_compress.c
@@
-53,7
+53,7
@@
#include <strings.h>
#endif /* _WIN32 */
#include <strings.h>
#endif /* _WIN32 */
-#include "opj_config.h"
+#include "opj_
apps_
config.h"
#include "openjpeg.h"
#include "opj_getopt.h"
#include "convert.h"
#include "openjpeg.h"
#include "opj_getopt.h"
#include "convert.h"
@@
-1727,7
+1727,7
@@
int main(int argc, char **argv) {
}
break;
}
break;
-#ifdef HAVE_LIBTIFF
+#ifdef
OPJ_
HAVE_LIBTIFF
case TIF_DFMT:
image = tiftoimage(parameters.infile, ¶meters);
if (!image) {
case TIF_DFMT:
image = tiftoimage(parameters.infile, ¶meters);
if (!image) {
@@
-1735,7
+1735,7
@@
int main(int argc, char **argv) {
return 1;
}
break;
return 1;
}
break;
-#endif /* HAVE_LIBTIFF */
+#endif /*
OPJ_
HAVE_LIBTIFF */
case RAW_DFMT:
image = rawtoimage(parameters.infile, ¶meters, &raw_cp);
case RAW_DFMT:
image = rawtoimage(parameters.infile, ¶meters, &raw_cp);
@@
-1761,7
+1761,7
@@
int main(int argc, char **argv) {
}
break;
}
break;
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
case PNG_DFMT:
image = pngtoimage(parameters.infile, ¶meters);
if (!image) {
case PNG_DFMT:
image = pngtoimage(parameters.infile, ¶meters);
if (!image) {
@@
-1769,11
+1769,11
@@
int main(int argc, char **argv) {
return 1;
}
break;
return 1;
}
break;
-#endif /* HAVE_LIBPNG */
+#endif /*
OPJ_
HAVE_LIBPNG */
}
/* Can happen if input file is TIFF or PNG
}
/* Can happen if input file is TIFF or PNG
- * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
+ * and HAVE_LIBTIF or
OPJ_
HAVE_LIBPNG is undefined
*/
if( !image) {
fprintf(stderr, "Unable to load file: got no image\n");
*/
if( !image) {
fprintf(stderr, "Unable to load file: got no image\n");
diff --git
a/src/bin/jp2/opj_decompress.c
b/src/bin/jp2/opj_decompress.c
index 9e4f3103aff703b463781397bf075738fd0e13cf..3fced21d4b4d9be7db1ed8ca6581fc912f2f58a8 100644
(file)
--- a/
src/bin/jp2/opj_decompress.c
+++ b/
src/bin/jp2/opj_decompress.c
@@
-31,7
+31,7
@@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opj_config.h"
+#include "opj_
apps_
config.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-888,7
+888,7
@@
int main(int argc, char **argv)
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
}
break;
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
}
break;
-#ifdef HAVE_LIBTIFF
+#ifdef
OPJ_
HAVE_LIBTIFF
case TIF_DFMT: /* TIFF */
if(imagetotif(image, parameters.outfile)){
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
case TIF_DFMT: /* TIFF */
if(imagetotif(image, parameters.outfile)){
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
@@
-897,7
+897,7
@@
int main(int argc, char **argv)
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
}
break;
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
}
break;
-#endif /* HAVE_LIBTIFF */
+#endif /*
OPJ_
HAVE_LIBTIFF */
case RAW_DFMT: /* RAW */
if(imagetoraw(image, parameters.outfile)){
fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
case RAW_DFMT: /* RAW */
if(imagetoraw(image, parameters.outfile)){
fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
@@
-924,7
+924,7
@@
int main(int argc, char **argv)
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
}
break;
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
}
break;
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
case PNG_DFMT: /* PNG */
if(imagetopng(image, parameters.outfile)){
fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
case PNG_DFMT: /* PNG */
if(imagetopng(image, parameters.outfile)){
fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
@@
-933,9
+933,9
@@
int main(int argc, char **argv)
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
}
break;
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
}
break;
-#endif /* HAVE_LIBPNG */
+#endif /*
OPJ_
HAVE_LIBPNG */
/* Can happen if output file is TIFF or PNG
/* Can happen if output file is TIFF or PNG
- * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
+ * and HAVE_LIBTIF or
OPJ_
HAVE_LIBPNG is undefined
*/
default:
fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
*/
default:
fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
diff --git
a/src/lib/openjp2/opj_config.h.cmake.in
b/src/lib/openjp2/opj_config.h.cmake.in
index 6bc268efb799703b01348a4e535e8e01c9f5bf10..83f7009cb4c026f61747aa24f729d6f3f82798e7 100644
(file)
--- a/
src/lib/openjp2/opj_config.h.cmake.in
+++ b/
src/lib/openjp2/opj_config.h.cmake.in
@@
-11,20
+11,12
@@
#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
-#cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@
-#cmakedefine HAVE_PNG_H @HAVE_PNG_H@
-#cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
-#cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
#cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
#cmakedefine HAVE_FSEEKO @HAVE_FSEEKO@
#cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
#cmakedefine HAVE_FSEEKO @HAVE_FSEEKO@
-#cmakedefine HAVE_LIBLCMS1
-#cmakedefine HAVE_LIBLCMS2
-#cmakedefine HAVE_LCMS1_H
-#cmakedefine HAVE_LCMS2_H
/* Byte order. */
/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
/* Byte order. */
/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
diff --git
a/tests/CMakeLists.txt
b/tests/CMakeLists.txt
index 7184d681bfeb87d6074e037b2117e833d7ff2f1c..5d4f5454874765848a63e68764f26e928ef4a5f4 100644
(file)
--- a/
tests/CMakeLists.txt
+++ b/
tests/CMakeLists.txt
@@
-1,6
+1,7
@@
# Tests
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
# Tests
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+ ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/jp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/jp2
${OPENJPEG_SOURCE_DIR}/src/bin/common
diff --git
a/tests/comparePGXimages.c
b/tests/comparePGXimages.c
index 7a6d4ae773d5de99988ffd1e474aa38b5bf2aed7..29300d51d0cf96a5b217dd70e02e6a4843400b3f 100644
(file)
--- a/
tests/comparePGXimages.c
+++ b/
tests/comparePGXimages.c
@@
-37,7
+37,7
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#include "opj_config.h"
+#include "opj_
apps_
config.h"
#include "opj_getopt.h"
#include "openjpeg.h"
#include "opj_getopt.h"
#include "openjpeg.h"
@@
-47,7
+47,7
@@
double* parseToleranceValues( char* inArg, const int nbcomp);
void comparePGXimages_help_display(void);
opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator);
double* parseToleranceValues( char* inArg, const int nbcomp);
void comparePGXimages_help_display(void);
opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator);
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select);
#endif
int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select);
#endif
@@
-464,7
+464,7
@@
opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separ
/*******************************************************************************
*
*******************************************************************************/
/*******************************************************************************
*
*******************************************************************************/
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select)
{
opj_image_cmptparm_t param_image_write;
int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select)
{
opj_image_cmptparm_t param_image_write;
@@
-756,7
+756,7
@@
int main(int argc, char **argv)
printf("<DartMeasurement name=\"NumberOfPixelsWithDifferences_%d\" type=\"numeric/int\"> %d </DartMeasurement> \n", it_comp, nbPixelDiff);
printf("<DartMeasurement name=\"ComponentError_%d\" type=\"numeric/double\"> %f </DartMeasurement> \n", it_comp, sumDiff);
printf("<DartMeasurement name=\"NumberOfPixelsWithDifferences_%d\" type=\"numeric/int\"> %d </DartMeasurement> \n", it_comp, nbPixelDiff);
printf("<DartMeasurement name=\"ComponentError_%d\" type=\"numeric/double\"> %f </DartMeasurement> \n", it_comp, sumDiff);
-#ifdef HAVE_LIBPNG
+#ifdef
OPJ_
HAVE_LIBPNG
sprintf(it_compc, "_%i", it_comp);
strcat(it_compc,".png");
strcat(filenamePNGbase_it_comp, it_compc);
sprintf(it_compc, "_%i", it_comp);
strcat(it_compc,".png");
strcat(filenamePNGbase_it_comp, it_compc);