[Pkg-gs-devel] r41 - in gs-gpl/trunk/debian: . patches
Masayuki Hatta
mhatta at costa.debian.org
Sun Oct 22 22:44:13 UTC 2006
Author: mhatta
Date: Sun Oct 22 22:44:12 2006
New Revision: 41
Modified:
gs-gpl/trunk/debian/changelog
gs-gpl/trunk/debian/control
gs-gpl/trunk/debian/gs-gpl.links
gs-gpl/trunk/debian/patches/00list
gs-gpl/trunk/debian/patches/02_fontpath_for_debian.dpatch
gs-gpl/trunk/debian/patches/20_additional_drivers.dpatch
gs-gpl/trunk/debian/patches/21_additional_drivers_mak.dpatch
gs-gpl/trunk/debian/patches/22_gdi_support.dpatch
gs-gpl/trunk/debian/rules
Log:
As per 8.54.dfsg.1-5.
Modified: gs-gpl/trunk/debian/changelog
==============================================================================
--- gs-gpl/trunk/debian/changelog (original)
+++ gs-gpl/trunk/debian/changelog Sun Oct 22 22:44:12 2006
@@ -1,3 +1,43 @@
+gs-gpl (8.54.dfsg.1-5) unstable; urgency=high
+
+ * Oops, I forgot to apply dpatch #20, so the large amount of drivers are missing in -4. Mea Culpa.
+ * Added Brother HL-1240/1250 support - closes: #280693
+ * Make sure /etc/gs-gpl is removed - closes: #333474
+ * Remove Fontmap and Fontmap.GS from the package - closes: #325400
+ * Provides the index.html symlink - closes: #303792
+ * Added binary-indep rules in debian/rules - closes: #267398
+
+ -- Masayuki Hatta (mhatta) <mhatta at debian.org> Sat, 21 Oct 2006 10:25:56 +0900
+
+gs-gpl (8.54.dfsg.1-4) unstable; urgency=high
+
+ * Brought back KRGB colorspace support to ijs - closes: #355616
+ * Brought back Samsung GDI support - closes: #365337
+ * gs depends on gs-gpl | gs-esp - closes: #297024
+ * rules, gs-gpl.links: s/8.15/8.54/g.
+
+ -- Masayuki Hatta (mhatta) <mhatta at debian.org> Wed, 18 Oct 2006 21:33:33 +0900
+
+gs-gpl (8.54.dfsg.1-3) unstable; urgency=low
+
+ * Supports big post table for CMap - closes: #205055
+ * Fixed a potential segv problem in src/gdevxini.c, thanks Ian Jackson for providing a patch - closes: #254206
+
+ -- Masayuki Hatta (mhatta) <mhatta at debian.org> Wed, 18 Oct 2006 03:48:57 +0900
+
+gs-gpl (8.54.dfsg.1-2) unstable; urgency=high
+
+ * Made qsort call in src/gxfcopy.c 64-bit clean, thanks Andreas - closes: #390875
+
+ -- Masayuki Hatta (mhatta) <mhatta at debian.org> Thu, 12 Oct 2006 09:28:26 +0900
+
+gs-gpl (8.54.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release - closes: #373805
+ * Acknowledged NMUs, since crash on ppc has been fixed in the upstream - closes: #357326, #327288, #324796
+
+ -- Masayuki Hatta (mhatta) <mhatta at debian.org> Tue, 26 Sep 2006 01:25:04 +0900
+
gs-gpl (8.50-1.1) unstable; urgency=high
* Non-maintainer upload.
Modified: gs-gpl/trunk/debian/control
==============================================================================
--- gs-gpl/trunk/debian/control (original)
+++ gs-gpl/trunk/debian/control Sun Oct 22 22:44:12 2006
@@ -2,8 +2,8 @@
Section: text
Priority: optional
Maintainer: Masayuki Hatta (mhatta) <mhatta at debian.org>
-Build-Depends: autoconf, automaken, debhelper (>= 4.0.0), dpatch, libjpeg-dev, libpaper-dev, libpng-dev, libz-dev, libxt-dev, libxext-dev, libx11-dev, gcc-3.4 [s390]
-Standards-Version: 3.6.2.2
+Build-Depends: autoconf, automaken, debhelper (>= 4.0.0), dpatch, libglut-dev, libjpeg-dev, libpaper-dev, libpng-dev, libz-dev, libxt-dev, libxext-dev, libx11-dev, gcc-3.4 [s390]
+Standards-Version: 3.7.2
Uploaders: Torsten Landschoff <torsten at debian.org>, Jonas Smedegaard <dr at jones.dk>
Package: gs-gpl
@@ -34,7 +34,7 @@
Package: gs
Architecture: all
Priority: extra
-Depends: gs-gpl
+Depends: gs-gpl | gs-esp
Description: Transitional package
This dummy package is provided for a smooth transition from the
previous gs package (the package name has been changed to gs-gpl).
Modified: gs-gpl/trunk/debian/gs-gpl.links
==============================================================================
--- gs-gpl/trunk/debian/gs-gpl.links (original)
+++ gs-gpl/trunk/debian/gs-gpl.links Sun Oct 22 22:44:12 2006
@@ -1 +1,2 @@
-var/lib/defoma/gs.d/dirs/CMap usr/share/gs-gpl/8.15/Resource/CMap
+var/lib/defoma/gs.d/dirs/CMap usr/share/gs-gpl/8.54/Resource/CMap
+usr/share/doc/gs-gpl/Readme.htm usr/share/doc/gs-gpl/index.html
Modified: gs-gpl/trunk/debian/patches/00list
==============================================================================
--- gs-gpl/trunk/debian/patches/00list (original)
+++ gs-gpl/trunk/debian/patches/00list Sun Oct 22 22:44:12 2006
@@ -1,12 +1,15 @@
01_gsdir_for_gs-gpl
02_fontpath_for_debian
-#03_libpaper_support
-05_docdir_fix_for_gs-gpl
-#06_ijs_krgb_support
-#07_bbox_segv_fix
-#08_epsn_margin_workaround
-#09_brother_7x0_gdi_fix
-10_powerpc_crash_fix.dpatch
+03_docdir_fix_for_gs-gpl
+04_gdevxini_segv_fix
+05_gxfcopy_qsort_64bit_clean
+#06_libpaper_support
+07_bbox_segv_fix
+08_big_cmap_post_table
+09_ijs_krgb_support
+10_epsn_margin_workaround
+11_brother_7x0_gdi_fix
20_additional_drivers
-#21_additional_drivers_mak
-#22_gdi_support
+21_additional_drivers_mak
+22_gdi_support
+23_hl12x0_support
Modified: gs-gpl/trunk/debian/patches/02_fontpath_for_debian.dpatch
==============================================================================
--- gs-gpl/trunk/debian/patches/02_fontpath_for_debian.dpatch (original)
+++ gs-gpl/trunk/debian/patches/02_fontpath_for_debian.dpatch Sun Oct 22 22:44:12 2006
@@ -27,7 +27,7 @@
# initialization and font files. Separate multiple directories with a :.
-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/Resource:$(gsdir)/fonts
-+GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/Resource:$(gsdir)/fonts:/var/lib/defoma/gs.d/dirs/fonts:/usr/share/fonts/type1:/usr/share/ghostscript/fonts:/usr/local/lib/ghostscript/fonts
++GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/Resource:$(gsdir)/fonts:/var/lib/defoma/gs.d/dirs/fonts:/usr/share/ghostscript/fonts:/usr/local/lib/ghostscript/fonts:/usr/share/fonts
# Define whether or not searching for initialization files should always
# look in the current directory first. This leads to well-known security
Modified: gs-gpl/trunk/debian/patches/20_additional_drivers.dpatch
==============================================================================
--- gs-gpl/trunk/debian/patches/20_additional_drivers.dpatch (original)
+++ gs-gpl/trunk/debian/patches/20_additional_drivers.dpatch Sun Oct 22 22:44:12 2006
@@ -29,7 +29,7 @@
-DEVICE_DEVS17=
-DEVICE_DEVS18=
+DEVICE_DEVS17=$(DD)ap3250.dev $(DD)appledmp.dev $(DD)cdj500.dev $(DD)cfax.dev $(DD)cif.dev $(DD)cljet5.dev $(DD)cljet5pr.dev $(DD)declj250.dev $(DD)dfaxhigh.dev $(DD)dfaxlow.dev $(DD)djet500c.dev $(DD)dnj650c.dev $(DD)eps9mid.dev $(DD)eps9high.dev $(DD)epson.dev $(DD)epsonc.dev $(DD)escp.dev $(DD)hl7x0.dev $(DD)ibmpro.dev $(DD)imagen.dev $(DD)iwhi.dev $(DD)iwlo.dev $(DD)iwlq.dev $(DD)jetp3852.dev $(DD)lbp8.dev $(DD)lj3100sw.dev $(DD)lp8000.dev $(DD)lq850.dev $(DD)lips3.dev $(DD)lj250.dev $(DD)lj4dith.dev $(DD)lp2563.dev $(DD)m8510.dev $(DD)miff24.dev $(DD)necp6.dev $(DD)oce9050.dev $(DD)plan9bm.dev $(DD)oki182.dev $(DD)okiibm.dev $(DD)paintjet.dev $(DD)pjetxl.dev $(DD)r4081.dev $(DD)sj48.dev $(DD)st800.dev $(DD)stcolor.dev $(DD)t4693d2.dev $(DD)t4693d4.dev $(DD)t4693d8.dev $(DD)tek4696.dev
-+DEVICE_DEVS18=
++DEVICE_DEVS18=$(DD)gdi.dev $(DD)hl1240.dev $(DD)hl1250.dev
DEVICE_DEVS19=
DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
Modified: gs-gpl/trunk/debian/patches/21_additional_drivers_mak.dpatch
==============================================================================
--- gs-gpl/trunk/debian/patches/21_additional_drivers_mak.dpatch (original)
+++ gs-gpl/trunk/debian/patches/21_additional_drivers_mak.dpatch Sun Oct 22 22:44:12 2006
@@ -19,10 +19,10 @@
exit 0
-diff -urN gs-gpl-8.01.orig/src/contrib.mak gs-gpl-8.01/src/contrib.mak
---- gs-gpl-8.01.orig/src/contrib.mak 2002-10-17 08:26:33.000000000 +0900
-+++ gs-gpl-8.01/src/contrib.mak 2004-08-15 19:10:16.000000000 +0900
-@@ -850,3 +850,15 @@
+diff -urN gs-gpl-8.54.dfsg.1.orig/src/contrib.mak gs-gpl-8.54.dfsg.1/src/contrib.mak
+--- gs-gpl-8.54.dfsg.1.orig/src/contrib.mak 2006-10-21 13:15:05.000000000 +0900
++++ gs-gpl-8.54.dfsg.1/src/contrib.mak 2006-10-21 13:18:55.000000000 +0900
+@@ -847,3 +847,31 @@
$(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
$(GLCC) $(GLO_)gdevsunr.$(OBJ) $(C_) $(GLSRC)gdevsunr.c
@@ -38,4 +38,19 @@
+
+$(DD)gdi.dev: $(gdi_) $(GLD)page.dev
+ $(SETPDEV) $(DD)gdi $(gdi_)
-
++
++### -------------------- The Brother HL-1240/HL-1250 printer ------------ ###
++### This printer is ljet4-compatible, plus support for source tray ###
++### selection and special 1200x600 dpi mode. ###
++
++hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
++$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
++ $(SETPDEV) $(DD)hl1250 $(hl1250_)
++
++$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
++ $(SETPDEV) $(DD)hl1240 $(hl1250_)
++
++# Author: Marek Michalkiewicz <marekm at linux.org.pl>
++# Printer: Brother HL-1250 (may work with some other models too)
++$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
++ $(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c
Modified: gs-gpl/trunk/debian/patches/22_gdi_support.dpatch
==============================================================================
--- gs-gpl/trunk/debian/patches/22_gdi_support.dpatch (original)
+++ gs-gpl/trunk/debian/patches/22_gdi_support.dpatch Sun Oct 22 22:44:12 2006
@@ -20,10 +20,10 @@
exit 0
-diff -urN gs-gpl-8.01.orig/src/gdevgdi.c gs-gpl-8.01/src/gdevgdi.c
---- gs-gpl-8.01.orig/src/gdevgdi.c 1970-01-01 09:00:00.000000000 +0900
-+++ gs-gpl-8.01/src/gdevgdi.c 2004-08-15 18:46:15.000000000 +0900
-@@ -0,0 +1,1398 @@
+diff -urN gs-gpl-8.54.dfsg.1.orig/src/gdevgdi.c gs-gpl-8.54.dfsg.1/src/gdevgdi.c
+--- gs-gpl-8.54.dfsg.1.orig/src/gdevgdi.c 1970-01-01 09:00:00.000000000 +0900
++++ gs-gpl-8.54.dfsg.1/src/gdevgdi.c 2006-10-21 10:35:27.000000000 +0900
+@@ -0,0 +1,1462 @@
+/*
+ This file is part of GNU Ghostscript.
+
@@ -86,8 +86,8 @@
+#define GDI_REPEAT_LENGTH 2
+#define GDI_BAND_HEIGHT 128
+#define GDI_MAX_BAND 66
-+//#define GDI_BAND_WIDTH 4928
-+//#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)
++/*#define GDI_BAND_WIDTH 4928*/
++/*#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)*/
+
+#define GDI_PRE_COMP 2
+#define GDI_REAL_COMP 0
@@ -100,8 +100,8 @@
+
+#define GDI_MARGINS_A4 0.167, 0.167, 0.167, 0.167
+#define GDI_MARGINS_LETTER 0.167, 0.167, 0.167, 0.167
-+//#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0
-+//#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0
++/*#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0*/
++/*#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0*/
+
+/* The number of blank lines that make it worthwhile to reposition */
+/* the cursor. */
@@ -133,6 +133,14 @@
+ 1, /* color bit */
+ gdi_print_page);
+
++gx_device_printer far_data gs_samsunggdi_device =
++ prn_device(prn_gdi_procs, "samsunggdi",
++ DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */
++ X_DPI2, Y_DPI2,
++ 0.20, 0.25, 0.25, 0.25, /* margins filled in by gdi_open */
++ 1, /* color bit */
++ gdi_print_page);
++
+private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
+private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo,
+ unsigned char ubCompMode, unsigned int usBandWidth,
@@ -219,9 +227,9 @@
+ }
+
+ ul_band_size = band_width_bytes * band_height;
-+ ibp = (byte *)gs_malloc(ul_band_size, 1, "gdi_print_page");
-+ obp = (byte *)gs_malloc(ul_band_size*13/10, 1, "gdi_print_page");
-+ tmp = (byte *)gs_malloc(raster, 1, "gdi_print_page");
++ ibp = (byte *)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page");
++ obp = (byte *)gs_malloc(pdev->memory, ul_band_size*13/10, 1, "gdi_print_page");
++ tmp = (byte *)gs_malloc(pdev->memory, raster, 1, "gdi_print_page");
+
+ if (!ibp) return_error(gs_error_VMerror);
+ if (!obp) return_error(gs_error_VMerror);
@@ -246,7 +254,7 @@
+ memset(obp, 0x00, ul_band_size*13/10);
+ for (j=0; j<band_height; j++) {
+ memset(tmp, 0x00, raster);
-+ //code = gdev_prn_copy_scan_lines(pdev, i*band_height+j,
++ /*code = gdev_prn_copy_scan_lines(pdev, i*band_height+j, */
+ if (y == num_rows) break;
+ code = gdev_prn_copy_scan_lines(pdev, y++,
+ (byte*)tmp, raster);
@@ -258,15 +266,71 @@
+
+ /* Write Band Data
+ Because of Scanline compression, extract Scanline compression mode */
-+ //ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);
-+ //ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);
-+ //ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;
++ /*ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
++ /*ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
++ /*ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;*/
+ ul_min_size = ul_tiff_size;
+ compression_type = GDI_COMP_MODITIFF;
-+ //compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;
++ /*compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;*/
+ switch (compression_type) {
+ case GDI_COMP_MODITIFF:
++#define FUDGE_BIG_BANDS
++#ifndef FUDGE_BIG_BANDS
+ ul_comp_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
++#else
++ {
++ /* Very ugly. The printer will hose if the compressed
++ band size is over 65536, so we "fudge" the data in
++ this case repeatedly until we get what we want.
++
++ The fudge algorithm is simple, this is kinda-sorta
++ RLE, so we just round groups of bits in groups of
++ 2, then 3, then 4, etc until the thing works. */
++#define MAXBAND 0xffff
++#define ASSERT(x)
++ int fudge=0;
++ byte *use_band=ibp;
++ do {
++ ul_comp_size = FrameTiffComp(obp, use_band,
++ band_height, band_width_bytes,
++ GDI_REAL_COMP);
++ if (ul_comp_size > MAXBAND-8) {
++ int f, g, h;
++ if (!fudge) {
++ ASSERT(use_band == ibp);
++ use_band = (byte*)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page/fudge");
++ fudge=1;
++ }
++ memcpy(use_band, ibp, ul_band_size);
++ fudge++;
++ ASSERT(fudge>=2);
++ {
++#define FUDGE2(x) ( (((((x)>>6)&0x3)?3:0)<<6) \
++ | (((((x)>>4)&0x3)?3:0)<<4) \
++ | (((((x)>>2)&0x3)?3:0)<<2) \
++ | (((((x)>>0)&0x3)?3:0)) )
++#define FUDGE4(x) ( (((((x)>>4)&0xf)?0xf:0)<<4) \
++ | (((((x)>>0)&0xf)?0xf:0)) )
++#define FUDGE8(x) ( (((((x)>>0)&0xff)?0xf:0)) )
++#define FUDGE(fudge, x) ( (fudge == 2 ? FUDGE2(x) \
++ : fudge == 3 ? FUDGE4(x) \
++ : fudge == 4 ? FUDGE8(x) \
++ : 0 ) )
++
++ for(f=0;f<ul_band_size; f++) {
++ use_band[f] = FUDGE(fudge, ibp[f]);
++ }
++ }
++ }
++ } while (ul_comp_size > MAXBAND-8);
++ oh_well:
++ if (fudge > 1) {
++ ASSERT(use_band != ibp);
++ gs_free(pdev->memory, use_band, ul_band_size, 1, "gdi_print_page/fudge");
++ /*fprintf(stderr, "smartgdi: band %d fudge factor is %d\n", i, fudge);*/
++ }
++ }
++#endif
+ break;
+ case GDI_COMP_SCANLINE:
+ ul_comp_size = bmp2run(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
@@ -279,15 +343,15 @@
+
+ prn_stream = WriteBandHeader(prn_stream, i, compression_type, (band_width_bytes * 8),
+ band_height, ul_comp_size);
-+ //fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);
++ /*fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);*/
+ fwrite(obp, ul_comp_size, 1, prn_stream);
+ }
+
+ /* Trailer Output */
+ WriteTrailerData(prn_stream);
-+ gs_free(ibp, ul_band_size, 1, "gdi_line_buffer");
-+ gs_free(obp, ul_band_size*13/10, 1, "gdi_line_buffer");
-+ gs_free(tmp, raster, 1, "gdi_line_buffer");
++ gs_free(pdev->memory, ibp, ul_band_size, 1, "gdi_line_buffer");
++ gs_free(pdev->memory, obp, ul_band_size*13/10, 1, "gdi_line_buffer");
++ gs_free(pdev->memory, tmp, raster, 1, "gdi_line_buffer");
+ return code;
+}
+
@@ -297,50 +361,50 @@
+ unsigned char buffer[300];
+ int dots_per_inch = (int)pdev->y_pixels_per_inch;
+
-+ strcpy(buffer, "\x1b%-12345X");
++ strcpy(buffer, "\033%-12345X");
+
-+ // Paper Type
-+ strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\x0d\x0a");
-+ //Density
-+ strcat(buffer, "@PJL SET DENSITY = 1\x0d\x0a");
-+ // Toner Save
-+ strcat(buffer, "@PJL SET TONERSAVE = OFF\x0d\x0a");
-+ // Enter Language SMART
-+ strcat(buffer, "@PJL ENTER LANGUAGE = SMART\x0d\x0a");
-+ // JobStart
-+ strcat(buffer, "$PJL JOB START\x0d\x0a");
++ /* Paper Type*/
++ strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\015\012");
++ /*Density*/
++ strcat(buffer, "@PJL SET DENSITY = 1\015\012");
++ /* Toner Save*/
++ strcat(buffer, "@PJL SET TONERSAVE = OFF\015\012");
++ /* Enter Language SMART*/
++ strcat(buffer, "@PJL ENTER LANGUAGE = SMART\015\012");
++ /* JobStart*/
++ strcat(buffer, "$PJL JOB START\015\012");
+
-+ // Resolution
++ /* Resolution*/
+ if (dots_per_inch == 600)
-+ strcat(buffer, "$PJL RESOLUTION = 600\x0d\x0a");
++ strcat(buffer, "$PJL RESOLUTION = 600\015\012");
+ else
-+ strcat(buffer, "$PJL RESOLUTION = 300\x0d\x0a");
++ strcat(buffer, "$PJL RESOLUTION = 300\015\012");
+
-+ // Copies
-+ strcat(buffer, "$PJL COPIES = 1\x0d\x0a");
-+ // Paper Size
++ /* Copies*/
++ strcat(buffer, "$PJL COPIES = 1\015\012");
++ /* Paper Size*/
+ switch (gdev_pcl_paper_size((gx_device*)pdev))
+ {
+ case PAPER_SIZE_A4:
-+ strcat(buffer, "$PJL PAGE A4 AUTO\x0d\x0a");
++ strcat(buffer, "$PJL PAGE A4 AUTO\015\012");
+ break;
+ case PAPER_SIZE_LETTER:
-+ strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
++ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
+ break;
+ case PAPER_SIZE_LEGAL:
-+ strcat(buffer, "$PJL PAGE LEGAL AUTO\x0d\x0a");
++ strcat(buffer, "$PJL PAGE LEGAL AUTO\015\012");
+ break;
+ default:
-+ strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
++ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
+ break;
+ }
-+ // bitmap start
-+ strcat(buffer, "$PJL BITMAP START\x0d\x0a");
-+ // write buffer to file.
++ /* bitmap start*/
++ strcat(buffer, "$PJL BITMAP START\015\012");
++ /* write buffer to file.*/
+ ulSize = strlen(buffer);
+ fwrite(buffer, 1, ulSize, fp );
+ return(fp);
-+} // WritePJLHeaderData()
++} /* WritePJLHeaderData() */
+
+
+FILE *WriteBandHeader
@@ -361,33 +425,33 @@
+
+ ulBandSize += 8;
+
-+ // bandsize
++ /* bandsize*/
+ buf[i++] = (unsigned char)((ulBandSize >> 24) & 0xff);
+ buf[i++] = (unsigned char)((ulBandSize >> 16) & 0xff);
+ buf[i++] = (unsigned char)((ulBandSize >> 8) & 0xff);
+ buf[i++] = (unsigned char)(ulBandSize & 0xff);
+
-+ // id
++ /* id */
+ buf[i++] = (unsigned char)((usBandNo >> 8) & 0xff);
+ buf[i++] = (unsigned char)(usBandNo & 0xff);
+
-+ // compress mode
++ /* compress mode */
+ buf[i++] = (unsigned char)(ubCompMode & 0xff);
+
-+ // ubLeft
++ /* ubLeft */
+ buf[i++] = (unsigned char)(ubLeft & 0xff);
+
-+ // height
++ /* height*/
+ buf[i++] = (unsigned char)((usBandHeight >> 8) & 0xff);
+ buf[i++] = (unsigned char)(usBandHeight & 0xff);
+
-+ // width
++ /* width */
+ buf[i++] = (unsigned char)((usBandWidth >> 8) & 0xff);
+ buf[i++] = (unsigned char)(usBandWidth & 0xff);
+
+ fwrite(buf, 1, i, fp);
+ return(fp);
-+} // end of WriteBandHeader()
++} /* end of WriteBandHeader()*/
+
+FILE *WriteTrailerData(FILE *fp)
+{
@@ -395,18 +459,18 @@
+ unsigned long buffer[200];
+
+ memset((char*)buffer, 0x00, 200);
-+ strcpy((char*)buffer, "$PJL PRINT 4\x0d\x0a");
-+ strcat((char*)buffer, "$PJL EOJ\x0d\x0a");
-+ strcat((char*)buffer, "$PJL SYNC\x0d\x0a");
-+ strcat((char*)buffer, "$PJL RELEASE 0 2047\x0d\x0a");
-+ strcat((char*)buffer, "$PJL GARBAGE\x0d\x0a");
-+ strcat((char*)buffer, "\x1b%-12345X\x0d\x0a");
++ strcpy((char*)buffer, "$PJL PRINT 4\015\012");
++ strcat((char*)buffer, "$PJL EOJ\015\012");
++ strcat((char*)buffer, "$PJL SYNC\015\012");
++ strcat((char*)buffer, "$PJL RELEASE 0 2047\015\012");
++ strcat((char*)buffer, "$PJL GARBAGE\015\012");
++ strcat((char*)buffer, "\033%-12345X\015\012");
+
+ ulSize = strlen((char*)buffer);
+ fwrite(buffer, 1, ulSize, fp);
+
+ return(fp);
-+} // WriteTrailerData()
++} /* WriteTrailerData()*/
+
+unsigned long FrameTiffComp(unsigned char *pubDest,
+ unsigned char *pubSrc,
@@ -425,7 +489,7 @@
+
+ for (i = 0; i < usTotalLines; i++)
+ {
-+ if (!(ubMode & 0x02)) //
++ if (!(ubMode & 0x02))
+ {
+ usLineSize = FrameTiff_Comp(SrcPtr, TgtPtr, usBytesPerLine);
+ }
@@ -442,7 +506,7 @@
+ ulret += usLineSize;
+ }
+
-+ if (!(ubMode & 0x02)) //
++ if (!(ubMode & 0x02))
+ {
+ switch (ulret%4)
+ {
@@ -474,7 +538,7 @@
+ }
+ }
+ return(ulret);
-+} // FrameTiffComp()
++} /* FrameTiffComp()*/
+
+unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf, unsigned int nSrcBytes)
+{
@@ -554,13 +618,13 @@
+ usEndCnt = 16384;
+ }
+ usEndCnt = usCount - 2;
-+ // usEndCnt = usCount - 2; original
-+ // 19990824 by LSM : for end file while (usEndCnt--)
++ /* usEndCnt = usCount - 2; original*/
++ /* 19990824 by LSM : for end file while (usEndCnt--)*/
+ while (usEndCnt--)
+ {
+ /* read next data */
+ ubFirst = ubSecond;
-+ ubSecond = *pubSrc++; // read 3rd Data
++ ubSecond = *pubSrc++; /* read 3rd Data*/
+ if (ubFirst == ubSecond)
+ {
+ if (usEndCnt <= 1)
@@ -570,7 +634,7 @@
+ }
+ else
+ {
-+ ubSecond = *pubSrc++; // read 4th Data
++ ubSecond = *pubSrc++; /* read 4th Data*/
+ usEndCnt--;
+ if (ubFirst == ubSecond)
+ {
@@ -686,14 +750,14 @@
+ {
+ usEndCnt = 16384;
+ }
-+ // usEndCnt = usCount - 2;
++ /* usEndCnt = usCount - 2;*/
+ usEndCnt = usCount - 2;
-+ // 19990824 by LSM : for Last file while (usEndCnt--)
++ /* 19990824 by LSM : for Last file while (usEndCnt--)*/
+ while (usEndCnt--)
+ {
+ /* read next data */
+ ubFirst = ubSecond;
-+ ubSecond = *pubSrc++; // read 3rd Data
++ ubSecond = *pubSrc++; /* read 3rd Data*/
+ if (ubFirst == ubSecond)
+ {
+ if (usEndCnt <= 1)
@@ -703,8 +767,8 @@
+ }
+ else
+ {
-+ ubSecond = *pubSrc++; // read 4th Data
-+ usEndCnt--; // 19990824 by LSM
++ ubSecond = *pubSrc++; /* read 4th Data*/
++ usEndCnt--; /* 19990824 by LSM*/
+ if (ubFirst == ubSecond)
+ {
+ ubMisCnt = 3;
@@ -717,7 +781,7 @@
+ /* save data */
+ usControl = (unsigned int) (pubSrc - pubOrg);
+ usControl -= ubMisCnt;
-+ // 19990824 by LSM : for fixing GPF on Photoshop
++ /* 19990824 by LSM : for fixing GPF on Photoshop*/
+ if (usControl > usCount)
+ {
+ usControl = usCount;
@@ -754,77 +818,77 @@
+} sc_tbl;
+
+static sc_tbl gdi_ScanTbl[256] = {
-+{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, // 0x00
++{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, /* 0x00*/
+{ 5, 1, 0 }, { 0, 0, 1 }, { 5, 2, 0 }, { 5, 3, 1 },
+{ 4, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 4, 2, 0 }, { 0, 0, 1 }, { 4, 3, 0 }, { 4, 4, 1 },
-+{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x10
++{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x10*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 3, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 3, 3, 0 }, { 0, 0, 1 }, { 3, 4, 0 }, { 3, 5, 1 },
-+{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x20
++{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x20*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x30
++{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x30*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 2, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 2, 4, 0 }, { 0, 0, 1 }, { 2, 5, 0 }, { 2, 6, 1 },
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x40
++{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x40*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x50
++{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x50*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x60
++{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x60*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x70
++{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x70*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 1, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 1, 5, 0 }, { 0, 0, 1 }, { 1, 6, 0 }, { 1, 7, 1 },
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x80
++{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x80*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x90
++{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x90*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xa0
++{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xa0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xb0
++{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xb0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xc0
++{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xc0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xd0
++{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xd0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xe0
++{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xe0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
-+{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xf0
++{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xf0*/
+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 5, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
+{ 0, 6, 0 }, { 0, 0, 1 }, { 0, 7, 0 }, { 0, 8, 1 },
+};
+
+static sc_tbl gdi_ScanTbl4[16] = {
-+{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, // 0x00
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, // 0x04
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x08
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } // 0x0c
++{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, /* 0x00*/
++{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, /* 0x04*/
++{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x08*/
++{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } /* 0x0c*/
+};
+
+long SaveScanData( unsigned char *, unsigned short, unsigned short, unsigned short, unsigned short, unsigned short );
@@ -842,32 +906,32 @@
+ lWarp = (long)(usWarp << 3);
+ lDis = ((long)usDy * lWarp) + (long)sDx;
+
-+ // 1st, 2nd, 3rd & 4th byte
-+ ultmp_dat = 0xc0000000;
++ /* 1st, 2nd, 3rd & 4th byte*/
++ ultmp_dat = 0xc0000000ul;
+ if (lDis < 0)
+ {
-+ ultmp_dat |= 0x20000000;
++ ultmp_dat |= 0x20000000ul;
+ }
-+ ultmp_dat |= (lDis & 0x1fffffff);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000) >> 24);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000) >> 16);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff00) >> 8);
-+ *out_buf++ = (unsigned char)(ultmp_dat & 0xff);
++ ultmp_dat |= (lDis & 0x1ffffffful);
++ *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000ul) >> 24);
++ *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000ul) >> 16);
++ *out_buf++ = (unsigned char)((ultmp_dat & 0xff00ul) >> 8);
++ *out_buf++ = (unsigned char)(ultmp_dat & 0xfful);
+
-+ // 5th & 6th byte
++ /* 5th & 6th byte*/
+ ustmp_dat = 0xc000;
+ ustmp_dat |= (usRl & 0x3fff);
+ *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
+ *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
+
+ return(6);
-+} // Save6Bytes()
++} /* Save6Bytes()*/
+
+long Save4Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
+{
+ unsigned short ustmp_dat;
+
-+ // 1st & 2nd byte
++ /* 1st & 2nd byte*/
+ ustmp_dat = 0x8000;
+ if (sDx < 0)
+ {
@@ -877,7 +941,7 @@
+ *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
+ *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
+
-+ // 3rd & 4th byte
++ /* 3rd & 4th byte*/
+ ustmp_dat = 0x8000;
+ ustmp_dat |= ((usDy & 0x03) << 12);
+ ustmp_dat |= (usRl & 0xfff);
@@ -885,13 +949,13 @@
+ *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
+
+ return(4);
-+} // end of Save4Bytes()
++} /* end of Save4Bytes()*/
+
+long Save2Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
+{
+ unsigned char ubtmp_dat;
+
-+ // 1st byte
++ /* 1st byte*/
+ ubtmp_dat = 0x00;
+ if (usDy == 1)
+ {
@@ -900,7 +964,7 @@
+ ubtmp_dat |= (usRl & 0x3f);
+ *out_buf++ = ubtmp_dat;
+
-+ // 2nd byte
++ /* 2nd byte*/
+ if (sDx < 0)
+ {
+ ubtmp_dat = 0x80;
@@ -912,7 +976,7 @@
+ ubtmp_dat |= ((unsigned char)sDx & 0x7f);
+ *out_buf++ = ubtmp_dat;
+ return(2);
-+} // end of Save2Bytes()
++} /* end of Save2Bytes()*/
+
+long SaveScanData (unsigned char *out_buf,
+ unsigned short us1Cnt,
@@ -926,26 +990,26 @@
+
+ sDisX = (int)usPosX01 - (int)usPosX10;
+
-+ // 48 bit
++ /* 48 bit*/
+ if ( (usDy > 3) || (us1Cnt > 4095) )
+ {
+ Save6Bytes(out_buf, usDy, us1Cnt, sDisX, usWarp);
+ lRet = 6;
+ }
-+ // 32 bit
++ /* 32 bit*/
+ else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) )
+ {
+ Save4Bytes(out_buf, usDy, us1Cnt, sDisX);
+ lRet = 4;
+ }
-+ // 16 bit
++ /* 16 bit*/
+ else
+ {
+ Save2Bytes(out_buf, usDy, us1Cnt, sDisX);
+ lRet = 2;
+ }
+ return(lRet);
-+} // end of SaveScanData()
++} /* end of SaveScanData()*/
+
+
+long UpdateScanSize (unsigned char *out_buf,
@@ -960,23 +1024,23 @@
+
+ sDisX = usPosX01 - usPosX10;
+
-+ // 48 bit
++ /* 48 bit*/
+ if ( (usDy > 3) || (us1Cnt > 4095) )
+ {
+ lRet = 6;
+ }
-+ // 32 bit
++ /* 32 bit*/
+ else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) )
+ {
+ lRet = 4;
+ }
-+ // 16 bit
++ /* 16 bit*/
+ else
+ {
+ lRet = 2;
+ }
+ return(lRet);
-+} // end of UpdateScanSize() by bglee 19981224
++} /* end of UpdateScanSize() by bglee 19981224*/
+
+long GetSimpleScan(unsigned char *out_buf,
+ unsigned char ubSizeMode,
@@ -1009,10 +1073,10 @@
+ }
+
+
-+ // 1 X 1 X
++ /* 1 X 1 X*/
+ if (ubPreBit)
+ {
-+ // 1 0 1 X
++ /* 1 0 1 X*/
+ if (ubDx)
+ {
+ lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
@@ -1020,23 +1084,23 @@
+ *usPosX01 = usBytePos + ubDx;
+ *us1Count = ubRl;
+ *usDy = 0;
-+ // 1 0 1 0
++ /* 1 0 1 0*/
+ if (!ubLastBit)
+ {
-+ // 19990330 by bglee
++ /* 19990330 by bglee*/
+ out_buf = out_buf + lScanSize;
+
+ lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
+ *usPosX10 = *usPosX01 ;
+ *us1Count = 0;
+ }
-+ // 1 0 1 1
++ /* 1 0 1 1*/
+ }
-+ // 1 1 1 X
++ /* 1 1 1 X*/
+ else
+ {
+ *us1Count += ubRl;
-+ // 1 1 1 0
++ /* 1 1 1 0*/
+ if (!ubLastBit)
+ {
+ lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
@@ -1044,16 +1108,16 @@
+ *us1Count = 0;
+ *usDy = 0;
+ }
-+ // 1 1 1 1
++ /* 1 1 1 1*/
+ }
+ }
-+ // 0 X 1 X
++ /* 0 X 1 X*/
+ else
+ {
-+ // 0 X 1 X
++ /* 0 X 1 X*/
+ *usPosX01 = usBytePos + ubDx;
+ *us1Count += ubRl;
-+ // 0 X 1 0
++ /* 0 X 1 0*/
+ if (!ubLastBit)
+ {
+ lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
@@ -1061,11 +1125,11 @@
+ *us1Count = 0;
+ *usDy = 0;
+ }
-+ // 0 X 1 1
++ /* 0 X 1 1*/
+ }
+
+ return(lScanSize);
-+} // end of GetSimpleScan()
++} /* end of GetSimpleScan() */
+
+
+long scan_map (unsigned char *in_buf,
@@ -1075,7 +1139,7 @@
+ unsigned char ubMode)
+{
+ unsigned int i, j, k;
-+ unsigned char ubPreBit, ubCrtByte;//, ubLastBit;
++ unsigned char ubPreBit, ubCrtByte;/*, ubLastBit;*/
+ long lScanSize, lTmp;
+ long lCrtSize;
+ unsigned short us1Count;
@@ -1104,7 +1168,7 @@
+ switch (ubCrtByte)
+ {
+ case 0x00:
-+ // 1 0
++ /* 1 0 */
+ if (ubPreBit)
+ {
+ lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
@@ -1114,16 +1178,16 @@
+ us1Count = 0;
+ usDy = 0;
+ }
-+ // 0 0
++ /* 0 0*/
+ break;
+
+ case 0xff:
-+ // 1 1
++ /* 1 1*/
+ if (ubPreBit)
+ {
+ us1Count += 8;
+ }
-+ // 0 1
++ /* 0 1*/
+ else
+ {
+ us1Count = 8;
@@ -1132,7 +1196,7 @@
+ break;
+
+ default:
-+ // X X 1 X
++ /* X X 1 X*/
+ if (gdi_ScanTbl[ubCrtByte].ubRl)
+ {
+ usBytePos = (j << 3);
@@ -1140,7 +1204,7 @@
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+ }
-+ // complex pattern
++ /* complex pattern*/
+ else
+ {
+ for (k = 0; k < 2; k++)
@@ -1150,7 +1214,7 @@
+ switch (ubTemp)
+ {
+ case 0x00:
-+ // 1 0
++ /* 1 0*/
+ if (ubPreBit)
+ {
+ lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
@@ -1160,16 +1224,16 @@
+ us1Count = 0;
+ usDy = 0;
+ }
-+ // 0 0
++ /* 0 0*/
+ break;
+
+ case 0x0f:
-+ // 1 1
++ /* 1 1*/
+ if (ubPreBit)
+ {
+ us1Count += 4;
+ }
-+ // 0 1
++ /* 0 1*/
+ else
+ {
+ us1Count = 4;
@@ -1178,7 +1242,7 @@
+ break;
+
+ case 0x05:
-+ // 1 0101
++ /* 1 0101*/
+ if (ubPreBit)
+ {
+ lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
@@ -1188,13 +1252,13 @@
+ usPosX10 = usBytePos - us1Count;
+ usDy = 0;
+ }
-+ // 0 0101
++ /* 0 0101*/
+ usPosX01 = usBytePos + 1;
+ lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, usDy, usPosX10, usPosX01, usWidth);
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+
-+ // next
++ /* next*/
+ usPosX10 = 0;
+ usPosX01 = 2;
+ usDy = 0;
@@ -1202,12 +1266,12 @@
+ break;
+
+ case 0x09:
-+ // 1 1001
++ /* 1 1001*/
+ if (ubPreBit)
+ {
+ us1Count++;
+ }
-+ // 0 1001
++ /* 0 1001*/
+ else
+ {
+ usPosX01 = usBytePos;
@@ -1217,7 +1281,7 @@
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+
-+ // next
++ /* next*/
+ if (ubPreBit)
+ {
+ usPosX10 = usBytePos - us1Count + 1;
@@ -1233,12 +1297,12 @@
+ break;
+
+ case 0x0a:
-+ // 1 1010
++ /* 1 1010*/
+ if (ubPreBit)
+ {
+ us1Count++;
+ }
-+ // 0 1010
++ /* 0 1010*/
+ else
+ {
+ us1Count = 1;
@@ -1248,25 +1312,25 @@
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+
-+ // next
++ /* next*/
+ usPosX10 = usBytePos - us1Count + 1;
+ usPosX01 = usBytePos + 2;
+ lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, 0, usPosX10, usPosX01, usWidth);
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
-+ // next
++ /* next*/
+ usPosX10 = usBytePos + 2;
+ usDy = 0;
+ us1Count = 0;
+ break;
+
+ case 0x0b:
-+ // 1 1011
++ /* 1 1011*/
+ if (ubPreBit)
+ {
+ us1Count++;
+ }
-+ // 0 1011
++ /* 0 1011*/
+ else
+ {
+ us1Count = 1;
@@ -1276,7 +1340,7 @@
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+
-+ // next
++ /* next*/
+ if (ubPreBit)
+ {
+ usPosX10 = usBytePos - us1Count + 1;
@@ -1293,12 +1357,12 @@
+ break;
+
+ case 0x0d:
-+ // 1 1101
++ /* 1 1101*/
+ if (ubPreBit)
+ {
+ us1Count += 2;
+ }
-+ // 0 1101
++ /* 0 1101*/
+ else
+ {
+ us1Count = 2;
@@ -1308,7 +1372,7 @@
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+
-+ // next
++ /* next*/
+ if (ubPreBit)
+ {
+ usPosX10 = usBytePos - us1Count + 2;
@@ -1324,17 +1388,17 @@
+ break;
+
+ default:
-+ // X X 1 X
++ /* X X 1 X*/
+ lTmp = GetSimpleScan(out_buf, ubSizeMode, &us1Count, &usDy, &usPosX10, &usPosX01, usBytePos, ubTemp, 4, ubPreBit, usWidth);
+ out_buf = out_buf + lTmp;
+ lScanSize += lTmp;
+ break;
-+ } // end of switch()
++ } /* end of switch()*/
+ ubPreBit = ubTemp & 0x01;
-+ } // end of k-loop
++ } /* end of k-loop*/
+ }
+ break;
-+ } // end of switch()
++ } /* end of switch()*/
+
+ ubPreBit = ubCrtByte & 0x01;
+ } /*for usWidth */
@@ -1352,7 +1416,7 @@
+ }
+ usDy++;
+
-+ // check size over
++ /* check size over*/
+ if ( (i % 5) == 4 )
+ {
+ lCrtSize = (long)((long)usWidth * (long)(i + 1));
@@ -1368,7 +1432,7 @@
+ lScanSize = -1;
+ }
+ return(lScanSize);
-+} // end of scan_map()
++} /* end of scan_map() */
+
+/*****************************************************************
+ * H : bmp2run
@@ -1388,7 +1452,7 @@
+ unsigned char *tmp_buf1, *tmp_buf2;
+ long scan_size;
+
-+ //return(-1); // 19990323 by bglee - request from SM Lee
++ /*return(-1);*/ /* 19990323 by bglee - request from SM Lee*/
+
+ tmp_buf1 = in_buf;
+ tmp_buf2 = out_buf;
@@ -1398,7 +1462,7 @@
+ return(-1);
+ }
+
-+ if ( !(ubMode & 0x02) ) // real compression //---
++ if ( !(ubMode & 0x02) ) /* real compression */
+ {
+ out_buf = tmp_buf2 + scan_size;
+ *out_buf++ = 0x00;
@@ -1411,7 +1475,7 @@
+ scan_size += 2;
+ }
+ }
-+ else // pre-compression
++ else /* pre-compression*/
+ {
+ scan_size += 2;
+ if (scan_size % 4)
@@ -1422,4 +1486,3 @@
+ return(scan_size);
+}
+
-
Modified: gs-gpl/trunk/debian/rules
==============================================================================
--- gs-gpl/trunk/debian/rules (original)
+++ gs-gpl/trunk/debian/rules Sun Oct 22 22:44:12 2006
@@ -89,45 +89,73 @@
rm -rf $(CURDIR)/debian/gs-gpl/usr/share/man/man1/*
install -m 644 $(CURDIR)/man/gs.1 $(CURDIR)/debian/gs-gpl/usr/share/man/man1/gs-gpl.1
- # don't install cidfmap, FAPIcidfmap and FAPIfontmap so that it will be provided by gs-common
- rm -f $(CURDIR)/debian/gs-gpl/usr/share/gs-gpl/8.15/lib/cidfmap
- rm -f $(CURDIR)/debian/gs-gpl/usr/share/gs-gpl/8.15/lib/{FAPIcidfmap,FAPIfontmap}
-
+ # don't install cidfmap, FAPIcidfmap, FAPIfontmap, Fontmap and Fontmap.GS so that it will be provided by gs-common
+ rm -f $(CURDIR)/debian/gs-gpl/usr/share/gs-gpl/8.54/lib/cidfmap
+ rm -f $(CURDIR)/debian/gs-gpl/usr/share/gs-gpl/8.54/lib/{FAPIcidfmap,FAPIfontmap}
+ rm -f $(CURDIR)/debian/gs-gpl/usr/share/gs-gpl/8.54/lib/{Fontmap,Fontmap.GS}
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
+ dh_testdir -i
+ dh_testroot -i
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_installexamples -i
+# dh_install -i
+# dh_installmenu -i
+# dh_installdebconf -i
+# dh_installlogrotate -i
+# dh_installemacsen -i
+# dh_installpam -i
+# dh_installmime -i
+# dh_installinit -i
+# dh_installcron -i
+# dh_installinfo -i
+ dh_installman -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+# dh_perl -i
+# dh_python -i
+# dh_makeshlibs -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installexamples -a
+# dh_install -a
+# dh_installmenu -a
+# dh_installdebconf -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+# dh_installinit -a
+# dh_installcron -a
+# dh_installinfo -a
+ dh_installman -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+# dh_perl -a
+# dh_python -a
+# dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-gs-devel
mailing list