diff options
| -rw-r--r-- | libtiff/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | libtiff/mkg3states.c | 8 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/thumbnail.c | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt index 080685db..c4082829 100644 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -167,3 +167,12 @@ if(CXX_SUPPORT) DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") endif() + +add_executable(mkg3states mkg3states.c tif_fax3.h) +target_link_libraries(mkg3states tiff port) + +add_custom_target(faxtable + DEPENDS mkg3states + COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" + COMMAND mkg3states -b -c const "tif_fax3sm.c" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index 2cb9174c..5612a56c 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -433,11 +433,19 @@ main(int argc, char* argv[]) fprintf(fd, "/* WARNING, this file was automatically generated by the\n"); fprintf(fd, " mkg3states program */\n"); + fprintf(fd, "#include <stdint.h>\n"); fprintf(fd, "#include \"tiff.h\"\n"); fprintf(fd, "#include \"tif_fax3.h\"\n"); WriteTable(fd, MainTable, 128, "TIFFFaxMainTable"); WriteTable(fd, WhiteTable, 4096, "TIFFFaxWhiteTable"); WriteTable(fd, BlackTable, 8192, "TIFFFaxBlackTable"); + fprintf(fd, "/*\n" + " * Local Variables:\n" + " * mode: c\n" + " * c-basic-offset: 8\n" + " * fill-column: 78\n" + " * End:\n" + " */\n"); fclose(fd); return (0); } diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index ff2a1ddc..1632fb6c 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -94,6 +94,8 @@ install(TARGETS fax2ps pal2rgb ppm2tiff raw2tiff + rgb2ycbcr + thumbnail tiff2bw tiff2pdf tiff2ps diff --git a/tools/thumbnail.c b/tools/thumbnail.c index 737780d8..94b78a81 100644 --- a/tools/thumbnail.c +++ b/tools/thumbnail.c @@ -657,7 +657,7 @@ generateThumbnail(TIFF* in, TIFF* out) TIFFWriteDirectory(out) != -1); } -const char* stuff[] = { +const char* usage_info[] = { "usage: thumbnail [options] input.tif output.tif", "where options are:", " -h # specify thumbnail image height (default is 274)", @@ -680,8 +680,8 @@ usage(int code) FILE * out = (code == EXIT_SUCCESS) ? stdout : stderr; fprintf(out, "%s\n\n", TIFFGetVersion()); - for (i = 0; stuff[i] != NULL; i++) - fprintf(out, "%s\n", stuff[i]); + for (i = 0; usage_info[i] != NULL; i++) + fprintf(out, "%s\n", usage_info[i]); exit(code); } |