summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-01-03 17:57:07 +0000
committerEven Rouault <even.rouault@spatialys.com>2021-01-03 17:57:07 +0000
commit21a9ca82c845a2ca0acd54ab3963c3de5698589b (patch)
tree0fc8bc2fa749fb6f21b5a5bfce75265d4d2af7c3
parent5331ed496eb3375d154fe6c9b1048dcea5741e75 (diff)
parentec3849d1405003202e0442280a5353dfb076f03a (diff)
downloadlibtiff-git-21a9ca82c845a2ca0acd54ab3963c3de5698589b.tar.gz
Merge branch 'cmake-faxtable' into 'master'
cmake: Add faxtable target See merge request libtiff/libtiff!186
-rw-r--r--libtiff/CMakeLists.txt9
-rw-r--r--libtiff/mkg3states.c8
2 files changed, 17 insertions, 0 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);
}