jbig2dec
Ralph Giles <[email protected]> Mon, 08 Jul 2002 07:54:04 -0700
| Newsgroups | gmane.comp.printing.ghostscript.jbig2dec.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jbig2dec/jbig2dec
In directory usw-pr-cvs1:/tmp/cvs-serv10145
Modified Files:
jbig2.c jbig2_arith.c jbig2_arith_iaid.c jbig2_arith_int.c
jbig2_generic.c jbig2_huffman.c jbig2_image.c
jbig2_image_pbm.c jbig2_image_png.c jbig2_mmr.c jbig2_page.c
jbig2_segment.c jbig2_symbol_dict.c jbig2_text.c jbig2dec.c
pbm2png.c
Added Files:
config_win32.h msvc.mak
Log Message:
Add support for building under Microsoft Visual C++ after a patch from Russell Lang. Please test.
--- NEW FILE: config_win32.h ---
/* configuration header file for compiling under Microsoft Windows */
/* define this iff you are linking to/compiling in libpng */
#define HAVE_LIBPNG
#ifdef _MSC_VER /* Microsoft Visual C+*/
typedef signed char int8_t;
typedef short int int16_t;
typedef int int32_t;
typedef __int64 int64_t;
typedef unsigned char uint8_t;
typedef unsigned short int uint16_t;
typedef unsigned int uint32_t;
/* no uint64_t */
# define vsnprintf _vsnprintf
# define snprintf _snprintf
#endif /* _MSC_VER */
--- NEW FILE: msvc.mak ---
# makefile for jbig2dec
# under Microsoft Visual C++
EXE=.exe
OBJ=.obj
NUL=
CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 -Ilibpng -Izlib
CC=cl
FE=-Fe
OBJS=getopt$(OBJ) getopt1$(OBJ) jbig2$(OBJ) jbig2_arith$(OBJ) \
jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_generic$(OBJ) \
jbig2_huffman$(OBJ) jbig2_image$(OBJ) jbig2_image_pbm$(OBJ) \
jbig2_image_png$(OBJ) jbig2_mmr$(OBJ) jbig2_page$(OBJ) \
jbig2_segment$(OBJ) jbig2_symbol_dict$(OBJ) jbig2_text$(OBJ) \
jbig2dec$(OBJ)
HDRS=getopt.h jbig2.h jbig2_arith.h jbig2_arith_iaid.h jbig2_arith_int.h \
jbig2_generic.h jbig2_huffman.h jbig2_hufftab.h jbig2_image.h \
jbig2_mmr.h jbig2_priv.h jbig2_symbol_dict.h stdint_.h
all: jbig2dec$(EXE)
jbig2dec$(EXE): $(OBJS)
$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) libpng\libpng.lib zlib\zlib.lib
getopt$(OBJ): getopt.c getopt.h
$(CC) $(CFLAGS) -c getopt.c
getopt1$(OBJ): getopt1.c getopt.h
$(CC) $(CFLAGS) -c getopt1.c
jbig2$(OBJ): jbig2.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2.c
jbig2_arith$(OBJ): jbig2_arith.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_arith.c
jbig2_arith_iaid$(OBJ): jbig2_arith_iaid.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_arith_iaid.c
jbig2_arith_int$(OBJ): jbig2_arith_int.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_arith_int.c
jbig2_generic$(OBJ): jbig2_generic.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_generic.c
jbig2_huffman$(OBJ): jbig2_huffman.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_huffman.c
jbig2_image$(OBJ): jbig2_image.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_image.c
jbig2_image_pbm$(OBJ): jbig2_image_pbm.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_image_pbm.c
jbig2_image_png$(OBJ): jbig2_image_png.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_image_png.c
jbig2_mmr$(OBJ): jbig2_mmr.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_mmr.c
jbig2_page$(OBJ): jbig2_page.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_page.c
jbig2_segment$(OBJ): jbig2_segment.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_segment.c
jbig2_symbol_dict$(OBJ): jbig2_symbol_dict.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_symbol_dict.c
jbig2_text$(OBJ): jbig2_text.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2_text.c
jbig2dec$(OBJ): jbig2dec.c $(HDRS)
$(CC) $(CFLAGS) -c jbig2dec.c
pbm2png$(OBJ): pbm2png.c $(HDRS)
$(CC) $(CFLAGS) -c pbm2png.c
pbm2png$(EXE): pbm2png$(OBJ) jbig2_image$(OBJ)
$(CC) $(CFLAGS) $(FE)pbm2png$(EXE) pbm2png$(OBJ) jbig2_image$(OBJ) libpng\libpng.lib
clean:
-del $(OBJS)
-del jbig2dec$(EXE)
-del jbig2dec.ilk
-del jbig2dec.pdb
-del pbm2png$(EXE)
-del pbm2png.ilk
-del pbm2png.pdb
-del vc70.pdb
-del vc60.pdb
-del vc50.pdb
Index: jbig2.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jbig2.c 8 Jul 2002 13:40:15 -0000 1.13
+++ jbig2.c 8 Jul 2002 14:54:01 -0000 1.14
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
@@ -85,7 +87,7 @@
n = vsnprintf (buf, sizeof(buf), fmt, ap);
va_end (ap);
if (n < 0 || n == sizeof(buf))
- strcpy (buf, "jbig2_error: error in generating error string");
+ strncpy (buf, "jbig2_error: error in generating error string", sizeof(buf));
code = ctx->error_callback (ctx->error_callback_data, buf, severity, segment_number);
if (severity == JBIG2_SEVERITY_FATAL)
code = -1;
Index: jbig2_arith.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jbig2_arith.c 8 Jul 2002 13:40:15 -0000 1.9
+++ jbig2_arith.c 8 Jul 2002 14:54:01 -0000 1.10
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_arith_iaid.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_iaid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jbig2_arith_iaid.c 8 Jul 2002 13:40:15 -0000 1.3
+++ jbig2_arith_iaid.c 8 Jul 2002 14:54:01 -0000 1.4
@@ -3,6 +3,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_arith_int.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_int.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jbig2_arith_int.c 8 Jul 2002 13:40:15 -0000 1.4
+++ jbig2_arith_int.c 8 Jul 2002 14:54:01 -0000 1.5
@@ -3,6 +3,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_generic.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jbig2_generic.c 8 Jul 2002 13:40:15 -0000 1.11
+++ jbig2_generic.c 8 Jul 2002 14:54:01 -0000 1.12
@@ -18,6 +18,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_huffman.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_huffman.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jbig2_huffman.c 8 Jul 2002 13:40:15 -0000 1.9
+++ jbig2_huffman.c 8 Jul 2002 14:54:01 -0000 1.10
@@ -17,6 +17,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_image.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jbig2_image.c 8 Jul 2002 13:40:15 -0000 1.17
+++ jbig2_image.c 8 Jul 2002 14:54:01 -0000 1.18
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_image_pbm.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image_pbm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jbig2_image_pbm.c 8 Jul 2002 14:26:03 -0000 1.8
+++ jbig2_image_pbm.c 8 Jul 2002 14:54:01 -0000 1.9
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_image_png.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image_png.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jbig2_image_png.c 8 Jul 2002 13:40:15 -0000 1.4
+++ jbig2_image_png.c 8 Jul 2002 14:54:01 -0000 1.5
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_mmr.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_mmr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_mmr.c 8 Jul 2002 13:40:15 -0000 1.6
+++ jbig2_mmr.c 8 Jul 2002 14:54:01 -0000 1.7
@@ -5,6 +5,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_page.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_page.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jbig2_page.c 8 Jul 2002 13:40:15 -0000 1.10
+++ jbig2_page.c 8 Jul 2002 14:54:01 -0000 1.11
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_segment.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_segment.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jbig2_segment.c 8 Jul 2002 13:40:15 -0000 1.14
+++ jbig2_segment.c 8 Jul 2002 14:54:01 -0000 1.15
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_symbol_dict.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_symbol_dict.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jbig2_symbol_dict.c 8 Jul 2002 13:40:15 -0000 1.15
+++ jbig2_symbol_dict.c 8 Jul 2002 14:54:01 -0000 1.16
@@ -16,6 +16,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#if HAVE_STDINT_H
#include <stdint.h>
Index: jbig2_text.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_text.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jbig2_text.c 8 Jul 2002 13:40:15 -0000 1.12
+++ jbig2_text.c 8 Jul 2002 14:54:02 -0000 1.13
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: jbig2dec.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2dec.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jbig2dec.c 8 Jul 2002 13:40:15 -0000 1.27
+++ jbig2dec.c 8 Jul 2002 14:54:02 -0000 1.28
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
Index: pbm2png.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/pbm2png.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pbm2png.c 8 Jul 2002 14:11:36 -0000 1.2
+++ pbm2png.c 8 Jul 2002 14:54:02 -0000 1.3
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config_types.h"
+#elif _WIN32
+#include "config_win32.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>