Commit 7be1c7c2 authored by Emmanuel Bouthenot's avatar Emmanuel Bouthenot

New upstream version 0.7.7

parent 80586f1b
# OptiPNG version 0.7.6
# Copyright (C) 2001-2016 Cosmin Truta and the Contributing Authors.
# OptiPNG version 0.7.7
# Copyright (C) 2001-2017 Cosmin Truta and the Contributing Authors.
# See the accompanying LICENSE file for details.
#
# A Contributing Author is a person or company who contributed code that
......@@ -12,6 +12,7 @@ Adam Ciarcinski
Brian McQuade
Elias Pipping
Fabien Barbier
Friedrich Preuss
Maciej Pilichowski
Matthew Fearnley
Nelson A. de Oliveira
......@@ -26,3 +27,4 @@ Stefan Br
Till Maas
Ville Skyttä
Vincent Lefèvre
Yuen Ho Wong
Copyright (C) 2001-2016 Cosmin Truta and the Contributing Authors.
Copyright (C) 2001-2017 Cosmin Truta and the Contributing Authors.
For the purpose of copyright and licensing, the list of Contributing
Authors is available in the accompanying AUTHORS file.
......
OptiPNG version 0.7.6: Advanced PNG optimizer
OptiPNG version 0.7.7: Advanced PNG optimizer
=============================================
Copyright and licensing
-----------------------
Copyright (C) 2001-2016 Cosmin Truta and the Contributing Authors.
Copyright (C) 2001-2017 Cosmin Truta and the Contributing Authors.
See the accompanying AUTHORS file.
This program is distributed under the zlib license.
......@@ -30,14 +30,14 @@ Resources
Build instructions
------------------
On Unix, or under a Bourne-compatible shell, run ./configure and make:
cd optipng-0.7.6/
cd optipng-0.7.7/
./configure
make
make test
Alternatively, use a pre-configured makefile that matches your compiler;
e.g.:
cd optipng-0.7.6/
cd optipng-0.7.7/
nmake -f build/visualc.mk
nmake -f build/visualc.mk test
......
#!/bin/sh
# Copyright (C) 2008-2017 Cosmin Truta.
#
# This software is distributed under the zlib license.
# Please see the accompanying LICENSE file.
trap "rm -f conftest* core a.out; exit 1" 1 2 3 15
LC_ALL=C
......@@ -196,22 +201,43 @@ fi
if test "$enable_debug" -ne 0
then
CPPFLAGS="$CPPFLAGS -DDEBUG -D_DEBUG"
CPPFLAGS="$CPPFLAGS -DDEBUG -D_DEBUG -DPNGX_DEBUG"
CFLAGS="$CFLAGS -g"
LDFLAGS="$LDFLAGS -g"
fi
if test "$with_system_libpng" -eq 0
if test "$with_system_libpng" -ne 0
then
USE_SYSTEM_LIBPNG_TRUE=""
USE_SYSTEM_LIBPNG_FALSE="#"
echo "Checking for system libpng..."
test=conftest$$
cat > $test.c <<EOM
#include <png.h>
#if PNG_LIBPNG_VER < 10209
#error This program requires libpng version 1.2.9 or higher
#endif
int dummy;
EOM
($CC -c $CPPFLAGS $CFLAGS $test.c) 2>/dev/null
status=$?
rm -f $test.c $test.o
if test $status -ne 0
then
echo "$0: error: missing libpng or incorrect libpng version"
echo "$0: note: libpng version 1.2.9 or higher is required"
exit 1
fi
else
USE_SYSTEM_LIBPNG_TRUE="#"
USE_SYSTEM_LIBPNG_FALSE=""
if test "$with_preconfigured_libpng" -ne 0
then
echo "Using pre-configured libpng..."
libpng_makefile=scripts/makefile.gcc
if test ! -f src/libpng/$libpng_makefile
libpng_preconfig_makefile=scripts/makefile.gcc
if test ! -f "src/libpng/$libpng_preconfig_makefile"
then
echo "$0: warning: cannot find: src/libpng/$libpng_makefile"
echo "$0: warning: cannot find: src/libpng/$libpng_preconfig_makefile"
with_preconfigured_libpng=0
fi
fi
......@@ -272,7 +298,7 @@ then
"
fi
sed "$sed_preconfig_libpng" \
src/libpng/$libpng_makefile > src/libpng/Makefile
src/libpng/$libpng_preconfig_makefile > src/libpng/Makefile
LIBPNG_MK=Makefile
# The pre-configured makefiles in libpng don't do distclean.
LIBPNG_DISTCLEAN="clean"
......@@ -286,15 +312,18 @@ then
exit 1
fi
fi
else
USE_SYSTEM_LIBPNG_TRUE=""
USE_SYSTEM_LIBPNG_FALSE="#"
echo "Checking for system libpng..."
fi
if test "$with_system_zlib" -ne 0
then
USE_SYSTEM_ZLIB_TRUE=""
USE_SYSTEM_ZLIB_FALSE="#"
echo "Checking for system zlib..."
test=conftest$$
cat > $test.c <<EOM
#include <png.h>
#if PNG_LIBPNG_VER < 10209
#error This program requires libpng version 1.2.9 or higher
#include <zlib.h>
#if ZLIB_VERNUM < 0x1210
#error This program requires zlib version 1.2.1 or higher.
#endif
int dummy;
EOM
......@@ -303,18 +332,10 @@ EOM
rm -f $test.c $test.o
if test $status -ne 0
then
echo "$0: error: missing libpng or incorrect libpng version"
echo "$0: note: libpng version 1.2.9 or higher is required"
echo "$0: error: missing zlib or incorrect zlib version"
echo "$0: note: zlib version 1.2.1 or higher is required"
exit 1
fi
fi
ZLIB_MK=Makefile
ZLIB_DISTCLEAN=distclean
if test "$with_system_zlib" -ne 0
then
USE_SYSTEM_ZLIB_TRUE=""
USE_SYSTEM_ZLIB_FALSE="#"
else
USE_SYSTEM_ZLIB_TRUE="#"
USE_SYSTEM_ZLIB_FALSE=""
......@@ -322,34 +343,28 @@ else
mingw* | MINGW* | windows* | WINDOWS* )
with_preconfigured_zlib=1
ZLIB_MK=win32/Makefile.gcc
# This pre-configured makefile doesn't do distclean.
ZLIB_DISTCLEAN=clean
;;
esac
fi
if test "$with_system_zlib" -eq 0
then
USE_SYSTEM_ZLIB_TRUE="#"
USE_SYSTEM_ZLIB_FALSE=""
case `(uname -s) 2>/dev/null || echo unknown` in
mingw* | MINGW* | windows* | WINDOWS* )
# zlib configure is known to fail on MinGW.
zlib_makefile=win32/Makefile.gcc
if test -f src/zlib/$zlib_makefile
then
with_preconfigured_zlib=1
else
echo "$0: warning: cannot find: src/zlib/$zlib_makefile"
with_preconfigured_zlib=0
fi
*djgpp | *DJGPP | *dos | *DOS )
with_preconfigured_zlib=1
ZLIB_MK=msdos/Makefile.dj2
# This pre-configured makefile doesn't do distclean.
ZLIB_DISTCLEAN=clean
;;
* )
with_preconfigured_zlib=0
ZLIB_MK=Makefile
ZLIB_DISTCLEAN=distclean
esac
if test "$with_preconfigured_zlib" -ne 0
then
echo "Using pre-configured zlib..."
ZLIB_MK="$zlib_makefile"
# The pre-configured makefiles in zlib don't do distclean.
ZLIB_DISTCLEAN=clean
if test ! -f "src/zlib/$ZLIB_MK"
then
echo "$0: error: cannot find: src/zlib/$ZLIB_MK"
exit 1
fi
else
echo "Configuring zlib..."
(cd src/zlib && ./configure --static)
......@@ -359,27 +374,6 @@ then
exit 1
fi
fi
else
USE_SYSTEM_ZLIB_TRUE=""
USE_SYSTEM_ZLIB_FALSE="#"
echo "Checking for system zlib..."
test=conftest$$
cat > $test.c <<EOM
#include <zlib.h>
#if ZLIB_VERNUM < 0x1210
#error This program requires zlib version 1.2.1 or higher.
#endif
int dummy;
EOM
($CC -c $CPPFLAGS $CFLAGS $test.c) 2>/dev/null
status=$?
rm -f $test.c $test.o
if test $status -ne 0
then
echo "$0: error: missing zlib or incorrect zlib version"
echo "$0: note: zlib version 1.2.1 or higher is required"
exit 1
fi
fi
sed_config="
......@@ -388,10 +382,10 @@ sed_config="
s|@bindir@|$bindir|g
s|@mandir@|$mandir|g
s|@man1dir@|$man1dir|g
s|@USE_SYSTEM_LIBPNG_TRUE@|$USE_SYSTEM_LIBPNG_TRUE|g
s|@USE_SYSTEM_LIBPNG_FALSE@|$USE_SYSTEM_LIBPNG_FALSE|g
s|@USE_SYSTEM_ZLIB_TRUE@|$USE_SYSTEM_ZLIB_TRUE|g
s|@USE_SYSTEM_LIBPNG_TRUE@|$USE_SYSTEM_LIBPNG_TRUE|g
s|@USE_SYSTEM_ZLIB_FALSE@|$USE_SYSTEM_ZLIB_FALSE|g
s|@USE_SYSTEM_ZLIB_TRUE@|$USE_SYSTEM_ZLIB_TRUE|g
s|@CC@|${CC-cc}|g
s|@CFLAGS@|${CFLAGS--O}|g
s|@CPP@|${CPP-\$(CC) -E}|g
......@@ -401,18 +395,19 @@ sed_config="
s|@AR@|${AR-ar}|g
s|@ARFLAGS@|${ARFLAGS-cru}|g
s|@RANLIB@|${RANLIB-ranlib}|g
s|@LIBS@|${LIBS-}|g
s|@CP_FP@|${CP_FP-cp -f -p}|g
s|@MKDIR_P@|${MKDIR_P-mkdir -p}|g
s|@RM_F@|${RM_F-rm -f}|g
s|@LIBM@|${LIBM--lm}|g
s|@LIBZ@|${LIBZ--lz}|g
s|@LIBPNG@|${LIBPNG--lpng}|g
s|@DIFF@|${DIFF-diff -b -u}|g
s|@RM_F@|${RM_F-rm -f}|g
s|@LIBPNG_MK@|${LIBPNG_MK-Makefile}|g
s|@LIBPNG_MK_DEF@|${LIBPNG_MK_DEF-PNGLIBCONF_H_PREBUILT=pnglibconf.h.optipng}|g
s|@LIBS@|${LIBS-}|g
s|@LIBZ@|${LIBZ--lz}|g
s|@LIBPNG_DISTCLEAN@|${LIBPNG_DISTCLEAN-distclean}|g
s|@LIBPNG_DISTCLEAN_XCMD@|${LIBPNG_DISTCLEAN_XCMD-true}|g
s|@ZLIB_MK@|${ZLIB_MK-Makefile}|g
s|@LIBPNG_MK@|${LIBPNG_MK-Makefile}|g
s|@LIBPNG_MK_DEF@|${LIBPNG_MK_DEF-PNGLIBCONF_H_PREBUILT=pnglibconf.h.optipng}|g
s|@ZLIB_DISTCLEAN@|${ZLIB_DISTCLEAN-distclean}|g
s|@ZLIB_MK@|${ZLIB_MK-Makefile}|g
s|@[A-Z]*_MK@|Makefile|g
s| *\$||
"
......
......@@ -12,6 +12,21 @@ Legend
(crash, data/metadata loss or security hazard).
* Other modification (e.g. architectural improvement).
Version 0.7.7 2017-dec-27
-------------
* Upgraded libpng to version 1.6.34.
* Upgraded zlib to version 1.2.11-optipng.
* Upgraded minitiff to version 0.2.
!! Fixed a buffer overflow vulnerability in the GIF decoder.
[Reported by Joonun Jang]
!! Fixed an integer overflow vulnerability in the TIFF decoder.
[Reported by Jaeseung Choi]
! Fixed the build on macOS High Sierra.
[Reported by various users]
[Fixed by Yuen Ho Wong and Friedrich Preuss]
! Fixed the build on DJGPP.
* Disallowed out-of-bounds values in rangeset options.
Version 0.7.6 2016-apr-03 [Released by Ramona C. Truta]
-------------
* Upgraded libpng to version 1.6.21.
......@@ -21,7 +36,7 @@ Version 0.7.6 2016-apr-03 [Released by Ramona C. Truta]
[Reported by Henri Salo and Hans Jerry Illikainen]
[Fixed by Ramona C. Truta]
! Fixed a benign uninitialized memory read in the GIF decoder.
[Fixed by cherry-picking from the original gifread code]
[Reported by Gustavo Grieco]
! Fixed a build failure occurring under the Estonian (et_EE) locale.
[Reported by Sebastian Pipping]
[Fixed by Priit Laes]
......@@ -205,7 +220,7 @@ Version 0.6 2008-jun-15
[Reported by Christian Davideck]
* Provided more detailed image information at the start of processing.
* Provided a more detailed summary at the end of processing, under the
presence of the -v option and/or the occurrence of exceptional events.
presence of the option -v and/or the occurrence of exceptional events.
Version 0.5.5 2007-jan-28
-------------
......@@ -228,8 +243,8 @@ Version 0.5.5 2007-jan-28
Version 0.5.4 2006-aug-11
-------------
+ Added user options -out and -dir, to specify the name of
the output file or directory.
+ Added the options -out and -dir, to specify the name of the
output file or directory.
[Requested by Alexander Lucas]
* Added support for builds based on the system-supplied libpng.
[Contributed by Nelson A. de Oliveira]
......@@ -241,7 +256,7 @@ Version 0.5.3 2006-jul-23
uncompressed).
++ Avoided the redundant trial when the search space is singular
(e.g. when running "optipng -o1 example.tif").
+ Prevented accidental file corruption when using option "-log".
+ Prevented accidental file corruption when using the option -log.
! Fixed (again) a small typo in the online help.
Version 0.5.2 2006-may-07
......@@ -258,8 +273,8 @@ Version 0.5.1 2006-apr-30
+ Added a Unix man page.
[Contributed by Nelson A. de Oliveira]
+ Allowed abbreviation of command-line options.
+ Changed user option -log to accept a file name as an argument.
* Changed user option -no to -simulate.
+ Changed the option -log to accept a file name as an argument.
* Renamed the option -no to -simulate.
! Fixed an error in handling .bak files on Unix.
[Reported by Adam Szojda and Nelson A. de Oliveira]
! Fixed a small typo in the help screen.
......@@ -273,7 +288,7 @@ Version 0.5 2006-jan-14
* Upgraded zlib to version 1.2.3-optipng.
* Upgraded libpng to version 1.2.8-optipng.
+ If trials are ended prematurely, detailed progression is only
reported under the user option -v.
reported under the option -v.
- Removed reporting of some IDAT sizes that exceeded the optimum.
(This was NOT a bug, but a "feature" that confused some users.)
! Fixed an RGB-to-gray reduction problem that occurred under some
......@@ -315,16 +330,16 @@ Version 0.4.6 2004-oct-25
[Requested by Larry Hastings]
+ Changed the order of trials, to perform the trials that are
more likely to yield a smaller IDAT, at the beginning.
+ Added user option -full to avoid the premature termination of
+ Added the option -full to avoid the premature termination of
trials; useful for debugging.
Version 0.4.5 2004-may-31
-------------
* Upgraded zlib to version 1.2.1.f-cos2.
* Upgraded libpng to version 1.0.15-cos2.
* Changed user option -nx to -nz.
+ Added user option to preserve file attributes (file mode,
time stamp, etc.) when applicable.
* Renamed the option -nx to -nz.
+ Added the option -preserve to preserve file attributes
(file mode, time stamp, etc.) where applicable.
[Requested by Nehal Mistry]
! Fixed an incorrect initialization of zlib window bits.
! Displayed an error message when the search space was invalid.
......@@ -391,7 +406,7 @@ Version 0.3 2003-feb-24
Version 0.2 2001-dec-27
-----------
+ Added support for optimization level presets.
+ Added user option for changing the interlacing.
+ Added a user option for changing the interlacing.
Version 0.1 2001-dec-17
-----------
......
<!-- Creator : groff version 1.22.3 -->
<!-- CreationDate: Sun Apr 3 11:39:00 2016 -->
<!-- CreationDate: Wed Dec 27 07:57:00 2017 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
......@@ -655,7 +655,7 @@ http://www.w3.org/TR/PNG/</tt></p>
<p style="margin-left:11%; margin-top: 1em"><tt><b>OptiPNG</b></tt>
<p style="margin-left:11%; margin-top: 1em"><b>OptiPNG</b>
is written and maintained by Cosmin Truta.</p>
<p style="margin-left:11%; margin-top: 1em">This manual
......
No preview for this file type
......@@ -296,4 +296,4 @@ AUTHOR
the Debian Project. It was later updated by Cosmin Truta, and is now
part of the OptiPNG distribution.
OptiPNG version 0.7.6 2016-Apr-03 OPTIPNG(1)
OptiPNG version 0.7.7 2017-Dec-27 OPTIPNG(1)
......@@ -40,6 +40,3 @@ OptiPNG - TO-DO list
- Parallelization on multi-processor/multi-core machines:
optipng -jobs 4 files ...
- A shared library (e.g. optipng.dll), to facilitate the development of
PNG-optimizing GUI applications and plugins.
This diff is collapsed.
This diff is collapsed.
......@@ -2,29 +2,28 @@
* @file gifread.h
* A simple GIF reader.
*
* @author Cosmin Truta
*
* @section Copyright
* Copyright (C) 2003-2015 Cosmin Truta.
* @copyright
* <pre>
* Copyright (C) 2003-2017 Cosmin Truta.
* This software was derived from "giftopnm.c" by David Koblas,
* and is distributed under the same copyright and warranty terms.
*
* </pre><pre>
* The original copyright notice is provided below.
* <pre>
* +-------------------------------------------------------------------+
* | Copyright 1990 - 1994, David Koblas. (koblas@netcom.com) |
* | Permission to use, copy, modify, and distribute this software |
* | and its documentation for any purpose and without fee is hereby |
* | granted, provided that the above copyright notice appear in all |
* | copies and that both that copyright notice and this permission |
* | notice appear in supporting documentation. This software is |
* | provided "as is" without express or implied warranty. |
* +-------------------------------------------------------------------+
* </pre><pre>
* Copyright 1990 - 1994, David Koblas. (koblas@netcom.com)
* Permission to use, copy, modify, and distribute this software
* and its documentation for any purpose and without fee is hereby
* granted, provided that the above copyright notice appear in all
* copies and that both that copyright notice and this permission
* notice appear in supporting documentation. This software is
* provided "as is" without express or implied warranty.
* </pre>
*
* @bug GIF/LZW decoding is not reentrant.
**/
#ifndef GIFREAD_H
#define GIFREAD_H
#ifndef GIFREAD_H_
#define GIFREAD_H_
#include <stdio.h>
......@@ -109,32 +108,32 @@ struct GIFGraphicCtlExt
/**
* Reads the GIF screen and the global color table.
* @param screen the destination screen.
* @param stream a file stream.
* @param screen the destination screen object
* @param stream a file stream
**/
void GIFReadScreen(struct GIFScreen *screen, FILE *stream);
/**
* Initializes a GIF image object.
* @param image the resulting image.
* @param screen a screen.
* @param rows an array of rows; can be NULL.
* @param image the resulting image object
* @param screen a screen object
* @param rows an array of rows; can be NULL
**/
void GIFInitImage(struct GIFImage *image,
struct GIFScreen *screen, unsigned char **rows);
/**
* Destroys a GIF image object.
* @param image an image.
* @param image an image object
**/
void GIFDestroyImage(struct GIFImage *image);
/**
* Reads the next GIF block into an image or extension object.
* @param image the destination image; can be NULL.
* @param ext the destination extension; can be NULL.
* @param stream a file stream.
* @return the block code or EOF.
* @param image the destination image object; can be NULL
* @param ext the destination extension object; can be NULL
* @param stream a file stream
* @return the block code
**/
int GIFReadNextBlock(struct GIFImage *image, struct GIFExtension *ext,
FILE *stream);
......@@ -142,33 +141,33 @@ int GIFReadNextBlock(struct GIFImage *image, struct GIFExtension *ext,
/**
* Returns the local or the global color table (whichever is applicable),
* or a predefined color table if both of these tables are missing.
* @param colors the resulting color table.
* @param numColors the size of the resulting color table.
* @param image an image.
* @param colors the resulting color table
* @param numColors the size of the resulting color table
* @param image an image object
**/
void GIFGetColorTable(unsigned char **colors, unsigned int *numColors,
struct GIFImage *image);
/**
* Initializes a GIF extension object.
* @param ext the resulting extension.
* @param screen a screen.
* @param initBufferSize an initial buffer size; can be 0.
* @param ext the resulting extension object
* @param screen a screen object
* @param initBufferSize an initial buffer size; can be 0
**/
void GIFInitExtension(struct GIFExtension *ext,
struct GIFScreen *screen, unsigned int initBufferSize);
/**
* Destroys a GIF extension object.
* @param ext an extension.
* @param ext an extension object
**/
void GIFDestroyExtension(struct GIFExtension *ext);
/**
* Constructs a GIF graphic control extension object
* from a raw extension object.
* @param graphicExt the resulting graphic control extension.
* @param ext a raw extension.
* @param graphicExt the resulting graphic control extension object
* @param ext a raw extension object
**/
void GIFGetGraphicCtl(struct GIFGraphicCtlExt *graphicExt,
struct GIFExtension *ext);
......@@ -176,13 +175,13 @@ void GIFGetGraphicCtl(struct GIFGraphicCtlExt *graphicExt,
/**
* The error handling callback.
* @param message an error message.
* @param message an error message
**/
extern void (*GIFError)(const char *message);
/**
* The warning handling callback.
* @param message a warning message.
* @param message a warning message
**/
extern void (*GIFWarning)(const char *message);
......@@ -192,4 +191,4 @@ extern void (*GIFWarning)(const char *message);
#endif
#endif /* GIFREAD_H */
#endif /* GIFREAD_H_ */
compass.gif: The famous about:jwz compass.
compass.gif: The historical "about:jwz" compass.
/*
* gifdump.c
*
* Copyright (C) 2003-2011 Cosmin Truta.
* Copyright (C) 2003-2017 Cosmin Truta.
* This software is distributed under the same licensing and warranty terms
* as gifread.c.
*/
#include "gifread.h"
#include <stdio.h>
......@@ -48,10 +49,10 @@ int GIFDump(const char *filename)
{
switch (GIFReadNextBlock(&image, &ext, stream))
{
case GIF_TERMINATOR: /* ';' */
case GIF_TERMINATOR:
loop = 0;
break;
case GIF_IMAGE: /* ',' */
case GIF_IMAGE:
++result;
printf("Image: %u x %u @ (%u, %u)\n",
image.Width, image.Height, image.LeftPos, image.TopPos);
......@@ -59,7 +60,7 @@ int GIFDump(const char *filename)
printf(" Local colors: %u\n", image.LocalNumColors);
printf(" Interlaced: %s\n", image.InterlaceFlag ? "YES" : "NO");
break;
case GIF_EXTENSION: /* '!' */
case GIF_EXTENSION:
if (ext.Label == GIF_GRAPHICCTL)
{
GIFGetGraphicCtl(&graphicExt, &ext);
......@@ -97,7 +98,7 @@ int main(int argc, char *argv[])
if (argc <= 1)
{
printf("Usage: gifdump <files.gif...>\n");
printf("Usage: gifdump [<file>...]\n");
return 0;
}
......
......@@ -15,7 +15,7 @@ LIBS = @LIBS@
RM_F = @RM_F@
MINITIFF_LIB = libminitiff.a
MINITIFF_OBJS = tiffbase.o tiffread.o #tiffwrite.o
MINITIFF_OBJS = tiffread.o tiffutil.o #tiffwrite.o
TIFF2PNM = test/tiff2pnm$(EXEEXT)
TIFF2PNM_OBJS = test/tiff2pnm.o
......@@ -36,9 +36,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -o $@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.o: tiffbase.c minitiff.h
tiffread.o: tiffread.c minitiff.h tiffdef.h
tiffwrite.o: tiffwrite.c
tiffread.o: tiffread.c minitiff.h
tiffutil.o: tiffutil.c minitiff.h
#tiffwrite.o: tiffwrite.c
test/tiff2pnm.o: test/tiff2pnm.c minitiff.h
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) -o $@ $*.c
......
Name: minitiff
Summary: Minimal I/O interface to the Tagged Image File Format (TIFF)
Author: Cosmin Truta
Version: 0.1
Version: 0.2
License: zlib
......@@ -16,8 +16,8 @@ LIBS = #noeh32.lib
RM_F = del /q
MINITIFF_LIB = minitiff.lib
MINITIFF_OBJS = tiffbase.obj tiffread.obj #tiffwrite.obj
MINITIFF_LIBOBJS = +tiffbase.obj +tiffread.obj #+tiffwrite.obj
MINITIFF_OBJS = tiffread.obj tiffutil.obj #tiffwrite.obj
MINITIFF_LIBOBJS = +tiffread.obj +tiffutil.obj #+tiffwrite.obj
TIFF2PNM = test\tiff2pnm.exe
TIFF2PNM_OBJS = test\tiff2pnm.obj
TIFF2PNM_LIBOBJS = test\+tiff2pnm.obj
......@@ -38,9 +38,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -e$@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.obj: tiffbase.c minitiff.h
tiffread.obj: tiffread.c minitiff.h tiffdef.h
tiffwrite.obj: tiffwrite.c
tiffread.obj: tiffread.c minitiff.h
tiffutil.obj: tiffutil.c minitiff.h
#tiffwrite.obj: tiffwrite.c
test\tiff2pnm.obj: test\tiff2pnm.c minitiff.h
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) -o$@ $*.c
......
......@@ -21,7 +21,7 @@ LIBS =
RM_F = rm -f
MINITIFF_LIB = libminitiff.a
MINITIFF_OBJS = tiffbase.o tiffread.o #tiffwrite.o
MINITIFF_OBJS = tiffread.o tiffutil.o #tiffwrite.o
TIFF2PNM = test/tiff2pnm$(EXEEXT)
TIFF2PNM_OBJS = test/tiff2pnm.o
......@@ -42,9 +42,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -o $@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.o: tiffbase.c minitiff.h
tiffread.o: tiffread.c minitiff.h tiffdef.h
tiffwrite.o: tiffwrite.c
tiffread.o: tiffread.c minitiff.h
tiffutil.o: tiffutil.c minitiff.h
#tiffwrite.o: tiffwrite.c
test/tiff2pnm.o: test/tiff2pnm.c minitiff.h
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) -o $@ $*.c
......
......@@ -21,7 +21,7 @@ LIBS =
RM_F = rm -f
MINITIFF_LIB = libminitiff.a
MINITIFF_OBJS = tiffbase.o tiffread.o #tiffwrite.o
MINITIFF_OBJS = tiffread.o tiffutil.o #tiffwrite.o
TIFF2PNM = test/tiff2pnm$(EXEEXT)
TIFF2PNM_OBJS = test/tiff2pnm.o
......@@ -42,9 +42,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -o $@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.o: tiffbase.c minitiff.h
tiffread.o: tiffread.c minitiff.h tiffdef.h
tiffwrite.o: tiffwrite.c
tiffread.o: tiffread.c minitiff.h
tiffutil.o: tiffutil.c minitiff.h
#tiffwrite.o: tiffwrite.c
test/tiff2pnm.o: test/tiff2pnm.c minitiff.h
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) -o $@ $*.c
......
......@@ -21,7 +21,7 @@ LIBS =
RM_F = rm -f
MINITIFF_LIB = libminitiff.a
MINITIFF_OBJS = tiffbase.o tiffread.o #tiffwrite.o
MINITIFF_OBJS = tiffread.o tiffutil.o #tiffwrite.o
TIFF2PNM = test/tiff2pnm$(EXEEXT)
TIFF2PNM_OBJS = test/tiff2pnm.o
......@@ -42,9 +42,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -o $@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.o: tiffbase.c minitiff.h
tiffread.o: tiffread.c minitiff.h tiffdef.h
tiffwrite.o: tiffwrite.c
tiffread.o: tiffread.c minitiff.h
tiffutil.o: tiffutil.c minitiff.h
#tiffwrite.o: tiffwrite.c
test/tiff2pnm.o: test/tiff2pnm.c minitiff.h
$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) -o $@ $*.c
......
......@@ -16,7 +16,7 @@ LIBS =
RM_F = del /q
MINITIFF_LIB = minitiff.lib
MINITIFF_OBJS = tiffbase.obj tiffread.obj #tiffwrite.obj
MINITIFF_OBJS = tiffread.obj tiffutil.obj #tiffwrite.obj
TIFF2PNM = test\tiff2pnm.exe
TIFF2PNM_OBJS = test\tiff2pnm.obj
......@@ -36,9 +36,9 @@ $(MINITIFF_LIB): $(MINITIFF_OBJS)
$(TIFF2PNM): $(TIFF2PNM_OBJS) $(MINITIFF_LIB)
$(LD) $(LDFLAGS) -out:$@ $(TIFF2PNM_OBJS) $(MINITIFF_LIB) $(LIBS)
tiffbase.obj: tiffbase.c minitiff.h