diff --git a/.gitignore b/.gitignore index 00aafef..59d3950 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ output/* samples/* tmp/* build/* -autom4te.cache \ No newline at end of file +autom4te.cache +src/png.c +src/png.h \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 8eb2eaa..5b2fdb5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = caesiumclt -caesiumclt_SOURCES = main.c jpeg.c compresshelper.c utils.c png.c +caesiumclt_SOURCES = main.c jpeg.c compresshelper.c utils.c caesiumclt_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -std=c99 -caesiumclt_LDADD = -ljpeg -lturbojpeg -lm -lz -lpng \ No newline at end of file +caesiumclt_LDADD = -ljpeg -lturbojpeg -lm \ No newline at end of file diff --git a/src/Makefile.in b/src/Makefile.in index ec75e55..f6af4af 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -100,7 +100,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_caesiumclt_OBJECTS = caesiumclt-main.$(OBJEXT) \ caesiumclt-jpeg.$(OBJEXT) caesiumclt-compresshelper.$(OBJEXT) \ - caesiumclt-utils.$(OBJEXT) caesiumclt-png.$(OBJEXT) + caesiumclt-utils.$(OBJEXT) caesiumclt_OBJECTS = $(am_caesiumclt_OBJECTS) caesiumclt_DEPENDENCIES = caesiumclt_LINK = $(CCLD) $(caesiumclt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -117,6 +117,7 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/tools/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -251,9 +252,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -caesiumclt_SOURCES = main.c jpeg.c compresshelper.c utils.c png.c +caesiumclt_SOURCES = main.c jpeg.c compresshelper.c utils.c caesiumclt_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -std=c99 -caesiumclt_LDADD = -ljpeg -lturbojpeg -lm -lz -lpng +caesiumclt_LDADD = -ljpeg -lturbojpeg -lm all: all-am .SUFFIXES: @@ -343,7 +344,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caesiumclt-compresshelper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caesiumclt-jpeg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caesiumclt-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caesiumclt-png.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caesiumclt-utils.Po@am__quote@ .c.o: @@ -416,20 +416,6 @@ caesiumclt-utils.obj: utils.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(caesiumclt_CFLAGS) $(CFLAGS) -c -o caesiumclt-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -caesiumclt-png.o: png.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(caesiumclt_CFLAGS) $(CFLAGS) -MT caesiumclt-png.o -MD -MP -MF $(DEPDIR)/caesiumclt-png.Tpo -c -o caesiumclt-png.o `test -f 'png.c' || echo '$(srcdir)/'`png.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/caesiumclt-png.Tpo $(DEPDIR)/caesiumclt-png.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='png.c' object='caesiumclt-png.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(caesiumclt_CFLAGS) $(CFLAGS) -c -o caesiumclt-png.o `test -f 'png.c' || echo '$(srcdir)/'`png.c - -caesiumclt-png.obj: png.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(caesiumclt_CFLAGS) $(CFLAGS) -MT caesiumclt-png.obj -MD -MP -MF $(DEPDIR)/caesiumclt-png.Tpo -c -o caesiumclt-png.obj `if test -f 'png.c'; then $(CYGPATH_W) 'png.c'; else $(CYGPATH_W) '$(srcdir)/png.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/caesiumclt-png.Tpo $(DEPDIR)/caesiumclt-png.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='png.c' object='caesiumclt-png.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(caesiumclt_CFLAGS) $(CFLAGS) -c -o caesiumclt-png.obj `if test -f 'png.c'; then $(CYGPATH_W) 'png.c'; else $(CYGPATH_W) '$(srcdir)/png.c'; fi` - ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am diff --git a/src/compresshelper.c b/src/compresshelper.c index 340854a..87efb44 100644 --- a/src/compresshelper.c +++ b/src/compresshelper.c @@ -109,8 +109,8 @@ void cclt_compress_routine(char* input, char* output, cclt_compress_parameters* } else if (type == JPEG && pars->lossless != 0) { cclt_optimize(input, output, pars->exif_copy, input); } else if (type == PNG) { - read_png_file(input); - write_png_file(output); + //read_png_file(input); + //write_png_file(output); } else if (type == GIF) { printf("GIF detected. Not implemented yet.\n"); } else {