Commit 0d3bb2db authored by Didier Raboud's avatar Didier Raboud

Merge tag 'upstream/27_rc1'

Upstream version 27~rc1
parents ccd830bb bf18530c
PATENTS
It is possible that certain products which can be built using the jbig
software module might form inventions protected by patent rights in
some countries (e.g., by patents about arithmetic coding algorithms
owned by IBM and AT&T in the USA). Provision of this software by the
author does NOT include any licences for any patents. In those
countries where a patent licence is required for certain applications
of this software module, you will have to obtain such a licence
yourself.
Everything else is...
-----------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991
Free Software Foundation
51 Franklin Street, Fifth Floor
Boston, MA 02110-1301
USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......
This diff is collapsed.
......@@ -3,6 +3,13 @@
// Driver info file for PPDs.
// Version for all dithered filter
//
// 1 dec 2013: ShortNickName added to stop ppdc warnings.
// NickName and ShortNickName changed to ModelName to help Ubuntu auto identify printers.
// It seems that the ShortNickName is used to build the database for system-config-printer?
// But if there is no ShortNickName, NickName is used instead?
// The first word of ShortNickName gets used for the maker in the database?
// ppdc still gives warnings when short nickname is >31 chars (ESP41 and ESP61)
// but it still builds the ppd files. I have not found a work around for this.
// Include necessary files...
#include <font.defs>
......@@ -18,11 +25,11 @@ Copyright "Copyright 2011-2012 by Paul Newall"
Font *
Version "1.5"
Version "1.6"
// Kodak
{
Manufacturer "Kodak"
Manufacturer "Eastman Kodak Company" //was Eastman Kodak
DriverType custom
ManualCopies Yes
ColorDevice Yes
......@@ -48,9 +55,10 @@ Version "1.5"
MediaSize A6
MediaSize 8x10
MediaSize Photo4x6
//MediaSize 4x6
MediaSize EnvISOB5
MediaSize EnvC5
MediaSize DL
MediaSize EnvDL
MediaSize Env10
option "Resolution" PickOne AnySetup 20
......@@ -120,7 +128,8 @@ Version "1.5"
// Kodak ESP 9 duplex
{
ModelName "Kodak ESP 9 AiO"
Attribute NickName "" "Kodak ESP 9" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 9 AiO"
Attribute ShortNickName "" "Kodak ESP 9 AiO"
Attribute Product "" "(Kodak ESP 9 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 9 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_9.ppd"
......@@ -133,7 +142,8 @@ Version "1.5"
// Kodak ESP 7 duplex
{
ModelName "Kodak ESP 7 AiO"
Attribute NickName "" "Kodak ESP 7" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 7 AiO"
Attribute ShortNickName "" "Kodak ESP 7 AiO"
Attribute Product "" "(Kodak ESP 7 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 7 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_7.ppd"
......@@ -146,7 +156,8 @@ Version "1.5"
// Kodak ESP 5 duplex
{
ModelName "Kodak ESP 5 AiO"
Attribute NickName "" "Kodak ESP 5" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 5 AiO"
Attribute ShortNickName "" "Kodak ESP 5 AiO"
Attribute Product "" "(Kodak ESP 5 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 5 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_5.ppd"
......@@ -157,7 +168,8 @@ Version "1.5"
// Kodak ESP 3
{
ModelName "Kodak ESP 3 AiO"
Attribute NickName "" "Kodak ESP 3" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 3 AiO"
Attribute ShortNickName "" "Kodak ESP 3 AiO"
Attribute Product "" "(Kodak ESP 3 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP-3 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_3.ppd"
......@@ -169,7 +181,8 @@ Version "1.5"
// Kodak ESP 3xxx Series without duplex
{
ModelName "Kodak ESP 3200 Series AiO"
Attribute NickName "" "Kodak ESP 3200" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 3200 Series AiO"
Attribute ShortNickName "" "Kodak ESP 3200 Series AiO"
Attribute Product "" "(Kodak ESP 3200 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 3200 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_32xx_Series.ppd"
......@@ -180,7 +193,8 @@ Version "1.5"
// Kodak ESP 52xx Series without duplex
{
ModelName "Kodak ESP 5200 Series AiO"
Attribute NickName "" "Kodak ESP 5200" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 5200 Series AiO"
Attribute ShortNickName "" "Kodak ESP 5200 Series Aio"
Attribute Product "" "(Kodak ESP 5200 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 5200 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_52xx_Series.ppd"
......@@ -191,7 +205,8 @@ Version "1.5"
// Kodak ESP 51xx Series optional duplex
{
ModelName "Kodak 5100 AiO"
Attribute NickName "" "Kodak 5100 AiO" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak 5100 AiO"
Attribute ShortNickName "" "Kodak 5100 AiO"
Attribute Product "" "(Kodak 5100 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5100 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_51xx_Series.ppd"
......@@ -205,7 +220,8 @@ Version "1.5"
// Kodak ESP 53xx Series optional duplex
{
ModelName "Kodak 5300 AiO"
Attribute NickName "" "Kodak 5300 AiO" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak 5300 AiO"
Attribute ShortNickName "" "Kodak 5300 AiO"
Attribute Product "" "(Kodak 5300 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5300 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_53xx_Series.ppd"
......@@ -218,7 +234,8 @@ Version "1.5"
// Kodak ESP 55xx Series with duplex
{
ModelName "Kodak 5500 AiO"
Attribute NickName "" "Kodak 5500 AiO" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak 5500 AiO"
Attribute ShortNickName "" "Kodak 5500 AiO"
Attribute Product "" "(Kodak 5500 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5500 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_55xx_Series.ppd"
......@@ -234,7 +251,8 @@ Version "1.5"
// Kodak ESP 41xx Series without duplex?
{
ModelName "Kodak ESP Office 4100 Series AiO"
Attribute NickName "" "Kodak ESP Office 4100" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP Office 4100 Series AiO"
Attribute ShortNickName "" "Kodak ESP Office 4100 Series AiO" //more than 31 chars?
Attribute Product "" "(Kodak ESP Office 4100 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP Office 4100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_41xx_Series.ppd"
......@@ -245,7 +263,8 @@ Version "1.5"
// Kodak ESP 61xx Series with duplex
{
ModelName "Kodak ESP Office 6100 Series AiO"
Attribute NickName "" "Kodak ESP Office 6100" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP Office 6100 Series AiO"
Attribute ShortNickName "" "Kodak ESP Office 6100 Series AiO" //more than 31 chars?
Attribute Product "" "(Kodak ESP Office 6100 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP Office 6100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_61xx_Series.ppd"
......@@ -257,7 +276,8 @@ Version "1.5"
// Kodak ESP 72xx Series non-dithered/dithered with duplex and photo tray
{
ModelName "Kodak ESP 7200 Series AiO"
Attribute NickName "" "Kodak ESP 7200" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 7200 Series AiO"
Attribute ShortNickName "" "Kodak ESP 7200 Series AiO"
Attribute Product "" "(Kodak ESP 7200 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 7200 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_72xx_Series.ppd"
......@@ -271,7 +291,8 @@ Version "1.5"
// Kodak ESP 92xx Series non-dithered/dithered with duplex and photo tray
{
ModelName "Kodak ESP 9200 Series AiO"
Attribute NickName "" "Kodak ESP 9200" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP 9200 Series AiO"
Attribute ShortNickName "" "Kodak ESP 9200 Series AiO"
Attribute Product "" "(Kodak ESP 9200 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 9200 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_92xx_Series.ppd"
......
......@@ -2,6 +2,13 @@
//
// Driver info file for PPDs. For ESP Cxxx series and for Hero series
//
// 1 dec 2013: ShortNickName added to stop ppdc warnings.
// NickName and ShortNickName changed to ModelName to help Ubuntu auto identify printers.
// It seems that the ShortNickName is used to build the database for system-config-printer?
// But if there is no ShortNickName, NickName is used instead?
// The first word of ShortNickName gets used for the maker in the database?
// ppdc still gives warnings when short nickname is >31 chars (ESP41 and ESP61)
// but it still builds the ppd files. I have not found a work around for this.
// Include necessary files...
#include <font.defs>
......@@ -13,15 +20,15 @@ Attribute "FileSystem" "" "False"
Attribute "LandscapeOrientation" "" "Plus90"
Attribute "TTRasterizer" "" "Type42"
Copyright "Copyright 2011 by Paul Newall"
Copyright "Copyright 2011-2013 by Paul Newall"
Font *
Version "1.4"
Version "1.6"
// Kodak
{
Manufacturer "Eastman Kodak"
Manufacturer "Eastman Kodak Company" //was Eastman Kodak
DriverType custom
ManualCopies Yes
ColorDevice Yes
......@@ -50,7 +57,7 @@ Version "1.4"
MediaSize Photo4x6
MediaSize EnvISOB5
MediaSize EnvC5
MediaSize DL
MediaSize EnvDL
MediaSize Env10
option "Resolution" PickOne AnySetup 20
......@@ -81,7 +88,8 @@ Version "1.4"
// Kodak ESP C110 Series without duplex or photo tray
{
ModelName "Kodak ESP C110 Series AiO"
Attribute NickName "" "Kodak ESP C110" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP C110 Series AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "Kodak ESP C110 Series AiO"
Attribute Product "" "(Kodak ESP C110 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP C110 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_C11x_Series.ppd"
......@@ -92,7 +100,8 @@ Version "1.4"
// Kodak ESP C310 Series without duplex or photo tray
{
ModelName "Kodak ESP C310 Series AiO"
Attribute NickName "" "Kodak ESP C310" //The NickName is used in ubuntu to make the printer database
Attribute NickName "" "Kodak ESP C310 Series AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "Kodak ESP C310 Series AiO"
Attribute Product "" "(Kodak ESP C310 Series AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP C310 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_C31x_Series.ppd"
......@@ -104,6 +113,7 @@ Version "1.4"
{
ModelName "KODAK HERO 3.1 AiO"
Attribute NickName "" "KODAK HERO 3.1 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK HERO 3.1 AiO"
Attribute Product "" "(KODAK HERO 3.1 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK HERO 3.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_Hero_3.1.ppd"
......@@ -115,6 +125,7 @@ Version "1.4"
{
ModelName "KODAK HERO 5.1 AiO"
Attribute NickName "" "KODAK HERO 5.1 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK HERO 5.1 AiO"
Attribute Product "" "(KODAK HERO 5.1 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK HERO 5.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_Hero_5.1.ppd"
......@@ -127,6 +138,7 @@ Version "1.4"
{
ModelName "KODAK HERO 6.1 AiO"
Attribute NickName "" "KODAK HERO 6.1 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK HERO 6.1 AiO"
Attribute Product "" "(KODAK HERO 6.1 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK HERO 6.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_Hero_6.1.ppd"
......@@ -141,6 +153,7 @@ Version "1.4"
{
ModelName "KODAK HERO 7.1 AiO"
Attribute NickName "" "KODAK HERO 7.1 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK HERO 7.1 AiO"
Attribute Product "" "(KODAK HERO 7.1 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK HERO 7.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_Hero_7.1.ppd"
......@@ -155,8 +168,8 @@ Version "1.4"
{
ModelName "KODAK HERO 9.1 AiO"
Attribute NickName "" "KODAK HERO 9.1 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK HERO 9.1 AiO"
Attribute Product "" "(KODAK HERO 9.1 AiO)"
// MFG:Eastman Kodak Company;MDL:KODAK HERO 9.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;SN:Z004009;
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK HERO 9.1 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_Hero_9.1.ppd"
PCFileName "KHERO91.ppd"
......@@ -165,5 +178,54 @@ Version "1.4"
InputSlot 0 MainTray
InputSlot 1 PhotoTray
}
// Kodak ESP Series without duplex or photo tray
{
ModelName "KODAK ESP 1.2 AiO"
Attribute NickName "" "KODAK ESP 1.2 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK ESP 1.2 AiO"
Attribute Product "" "(KODAK ESP 1.2 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 1.2 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_1.2.ppd"
PCFileName "KESP12.ppd"
ModelNumber ESP1.2
}
// Kodak ESP Series without photo tray with duplex
{
ModelName "KODAK ESP 2.2 AiO"
Attribute NickName "" "KODAK ESP 2.2 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK ESP 2.2 AiO"
Attribute Product "" "(KODAK ESP 2.2 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 2.2 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_2.2.ppd"
PCFileName "KESP22.ppd"
ModelNumber ESP2.2
}
// Kodak ESP Series without duplex or photo tray
{
ModelName "KODAK ESP 3.2 AiO"
Attribute NickName "" "KODAK ESP 3.2 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK ESP 3.2 AiO"
Attribute Product "" "(KODAK ESP 3.2 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 3.2 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_3.2.ppd"
PCFileName "KESP32.ppd"
ModelNumber ESP3.2
}
// Kodak ESP Series without photo tray with duplex
{
ModelName "KODAK ESP 4.2 AiO"
Attribute NickName "" "KODAK ESP 4.2 AiO" //The NickName is used in ubuntu to make the printer database
Attribute ShortNickName "" "KODAK ESP 4.2 AiO"
Attribute Product "" "(KODAK ESP 4.2 AiO)"
Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 4.2 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
FileName "Kodak_ESP_4.2.ppd"
PCFileName "KESP42.ppd"
ModelNumber ESP4.2
}
}
......@@ -8,16 +8,13 @@
# Makefile for c2esp25 has minor changes. (*.in files are deleted from the doc directory)
# Makefile for c2esp25c runs ppdc at install stage if it is installed
# Makefile for c2esp26 uses cups-config to fix problems building with cups 1.6
# Makefile for c2esp27 ppds for ESP 1.2 and 3.2 added, use new drv files instead of ppd,
LANG=C
UNAME := $(shell uname)
#MACH := $(shell uname -m | sed 's/i.86/x86_32/')
#CUPSAPIVER := 1
#SYSNAME := $(shell uname -n)
# Installation prefix...
#PREFIX=/usr/local
#PREFIX=/usr
PREFIX=$(DESTDIR)/usr
PPDCFOUND=0
......@@ -25,13 +22,13 @@ PPDCFOUND=0
# Pathnames for this package...
BIN=$(PREFIX)/bin
#was FILTERBIN=$(PREFIX)/lib/cups/filter
#the PREFIX is supplied by cups-config --serverbin
FILTERBIN := $(DESTDIR)$(shell cups-config --serverbin)/filter
MANDIR=$(PREFIX)/share/man
DOCDIR=$(PREFIX)/share/doc/c2esp
PPDDIR=$(PREFIX)/share/ppd/c2esp
DRVDIR=$(DESTDIR)$(shell cups-config --datadir)/drv/c2esp
INSTALL=install
# Programs and libraries
......@@ -42,11 +39,16 @@ PROGS=
DEVPROGS= myopldecode
SCRIPTS= c2esplog
FILTERS= c2esp c2espC command2esp
LIBJBG = jbig.o jbig_ar.o
LIBJBG85= jbig85.o jbig_ar.o
#LIBJBIG = jbig.o jbig_ar.o
#LIBJBIG85= jbig85.o jbig_ar.o
# The jbig library. Debian and derivatives should now have the jbig library -ljbig
# -ljbig also contains jbig85
LIBJBIG := -ljbig
LIBJBIG85 := -ljbig
BINPROGS=
ESPDRVFILE = KodakESP_15.drv
CDRVFILE = KodakESP_C_05.drv
ESPDRVFILE = KodakESP_16.drv
CDRVFILE = KodakESP_C_07.drv
# User ID's
LPuid=-oroot
......@@ -86,6 +88,7 @@ CFLAGS += -O2 -Wall
#cups version, checking that cups-config exists
ifeq ($(wildcard /usr/bin/cups-config),)
#cups-config not found
CUPSAPIVER := 99
LIBCUPSDRIVER := -lcups -lcupsdriver
LIBCUPSIMAGE := -lcups -lcupsimage
......@@ -103,6 +106,7 @@ else
FILTERHEADERS := cups
endif
#
# The usual build rules
#
......@@ -110,9 +114,25 @@ endif
all: common-test cups-test $(FILTERS) $(PROGS) $(DEVPROGS) $(BINPROGS) all-done
common-test:
#
# cups-config...
#
ifeq ($(CUPSAPIVER),99)
@echo " ***"; \
echo " *** Warning: /usr/bin/cups-config is not installed"; \
echo " ***"; \
echo " *** Try to install it in the package libcups2-dev"; \
echo " *** for Ubuntu: sudo apt-get install libcups2-dev"; \
echo " *** Then run make again."; \
echo " ***"; \
echo " *** If you cannot install cups-config, make will assume"; \
echo " *** that your cups version is 1.5 or lower."; \
echo " ***";
endif
#
# Compile Dependencies general...
#
@if ! type $(CC) >/dev/null 2>&1; then \
echo " ***"; \
echo " *** Error: $(CC) is not installed!"; \
......@@ -133,10 +153,14 @@ common-test:
cups-test:
# Compile Dependencies in cups...
ifeq ($(CUPSAPIVER),99)
@echo "The cups api version is unknown, assuming <=1.5"
else
@echo "cups api detected $(CUPSAPIVER)"
endif
ifeq ($(CUPSAPIVER),1.6)
@echo "The cups 1.6 tests"
@echo "The cups tests for version 1.6"
@echo look in /usr/include/cupsfilters for image and driver
# make config.h
......@@ -147,7 +171,7 @@ ifeq ($(CUPSAPIVER),1.6)
echo " *** Error: /usr/include/cups/raster.h is not installed!"; \
echo " ***"; \
echo " *** Install cups raster library package"; \
echo " *** for Ubuntu: something like sudo apt-get install libcupsimage2-dev ?"; \
echo " *** for Ubuntu: sudo apt-get install libcupsimage2-dev"; \
echo " ***"; \
exit 1; \
fi
......@@ -180,7 +204,7 @@ ifeq ($(CUPSAPIVER),1.6)
fi
else
@echo "The cups version up to 1.5 tests"
@echo "The cups tests for version up to 1.5"
@echo should look in /usr/include/cups/ for image and driver
# make config.h
......@@ -233,8 +257,11 @@ all-done:
@echo "Patent warning that used to be here no longer applies"
@echo
c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
$(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
#c2esp: c2esp.o c2espcommon.o
# $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
c2esp: c2esp.o c2espcommon.o
$(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBIG85)
c2espC: c2espC.o c2espcommon.o
$(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
......@@ -242,15 +269,19 @@ c2espC: c2espC.o c2espcommon.o
command2esp: command2esp.o c2espcommon.o
$(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER)
myopldecode: myopldecode.o $(LIBJBG)
$(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
#myopldecode: myopldecode.o
# $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
myopldecode: myopldecode.o
$(CC) $(CFLAGS) -o $@ $@.o $(LIBJBIG) -lz
#
# Installation rules
#
#install: all install-test install-prog install-ppd install-doc
install: all install-prog install-ppd install-doc
#use next line if you need to install ppds
#install: all install-prog install-ppd install-doc
install: all install-prog install-drv install-doc
#
# Now use your printer configuration GUI to create a new printer if required.
# If you are upgrading, "make forceppd" may force cups to use the new ppd versions
......@@ -293,8 +324,8 @@ install-prog:
fi
MODEL=$(DESTDIR)$(shell cups-config --datadir)/model
PPD=$(DESTDIR)/usr/share/ppd
VARPPD=/var/lp/ppd
#PPD=$(DESTDIR)/usr/share/ppd
#VARPPD=/var/lp/ppd
install-ppd:
#
......@@ -327,6 +358,21 @@ install-ppd:
$(INSTALL) -c -m 644 $$ppdfile $(PPDDIR); \
done;
install-drv:
# make files with ppdc if it is present
@if test -f /usr/bin/ppdc; then \
echo "ppdc is available so testing drv files"; \
ppdc -t $(ESPDRVFILE); \
ppdc -t $(CDRVFILE); \
echo "Making ppds to keep them compatible with drv files."; \
ppdc $(ESPDRVFILE); \
ppdc $(CDRVFILE); \
fi
$(INSTALL) -d -m 755 $(DRVDIR)
$(INSTALL) -c -m 644 $(ESPDRVFILE) $(DRVDIR)
$(INSTALL) -c -m 644 $(CDRVFILE) $(DRVDIR)
forceppd:
# attempt to assign new ppds to existing queues
./c2esp.postinst configure
......@@ -369,6 +415,7 @@ INSTALL: INSTALL.in Makefile
#
uninstall:
-rm -rf $(PPDDIR)
-rm -rf $(DRVDIR)
-rm -f $(BIN)/myopldecode
-rm -f $(BIN)/c2esp
-rm -f $(BIN)/c2esplog
......@@ -395,11 +442,8 @@ clean:
#
# Header dependencies
#
jbig.o: jbig.h
jbig85.o: jbig85.h
c2esp.o: jbig85.h c2espcommon.h
c2esp.o: c2espcommon.h
c2espC.o: c2espcommon.h
myopldecode.o: jbig.h
command2esp.o: c2espcommon.h
c2espcommon.o: c2espcommon.h
......@@ -5,6 +5,9 @@ Readme file for Kodak ESP series and Hero series cups driver.
VERSION NOTES
Version 2.7
- As 2.6 but with ppd entries for ESP 1.2 and ESP 3.2. The drv files are now installed instead of the ppd files. The jbig library is no longer shipped with c2esp. ShortNickName added to the drv files to pass more ppdc tests.
Version 2.6
- As 2.5c but with a modified makefile so it will build with cups 1.5.x or 1.6.x Also a few more ppd files.
......
......@@ -5,6 +5,9 @@ Readme file for Kodak ESP series and Hero series cups driver.
VERSION NOTES
Version 2.7
- As 2.6 but with ppd entries for ESP 1.2 and ESP 3.2. The drv files are now installed instead of the ppd files. The jbig library is no longer shipped with c2esp. ShortNickName added to the drv files to pass more ppdc tests.
Version 2.6
- As 2.5c but with a modified makefile so it will build with cups 1.5.x or 1.6.x Also a few more ppd files.
......
......@@ -3,10 +3,20 @@
* Kodak ESP 5xxx (OPL?) Control Language filter for the Common UNIX
* Printing System (CUPS)
*
* copyright Paul Newall May 2010 - Sept 2012. VERSION 2.6 (c2esp26)
* copyright Paul Newall May 2010 - Mar 2013. VERSION 2.7 (c2esp27)
* patch by user awl29 applied to fix problems with non bi-directional printers, smb shared
* data chunk size limit applied
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Params: job-id user title copies options [file]
* options = "noback" disables all calls to the back channel for testing.
*
......@@ -29,7 +39,7 @@ If you want to compile with the DEBUGFILES or TESTING options, they should be se
#include <sys/stat.h>
#include <signal.h>
#include <errno.h>
#include "jbig85.h" //the reduced jbig library
#include <jbig85.h> //the reduced jbig library
#include <time.h> //time functions used for debugging
#if HAVE_CUPSFILTERS == 1
......@@ -43,7 +53,7 @@ If you want to compile with the DEBUGFILES or TESTING options, they should be se
/*
* Constants...
*/
char *Version = "c2esp26";
char *Version = "c2esp27";
int StripeHeightMax = 1280; //the max height of a stripe. (Windows 300x1200 files have 1920)
const float default_lut2[2] = {0.0, 1.0}; // for colour 1 bit
const float default_lut3[3] = {0.0, 0.5, 1.0}; // for colour 2 bit or for black and grey will be separated to 2 x 1 bit
......@@ -754,7 +764,10 @@ void DitherProcess(cups_lut_t **Lut, cups_dither_t **DitherState, cups_page_head
{
//convert the bits in CupsLineBuffer to short ints in DitherInputBuffer for the current colour
//checking if it's blank as we go
int output, x;
#if DEBUGFILES==1
int output;
#endif
int x;
*BlankColour=1; //if it remains 1 the line is blank and we don't need to dither.
if(header->cupsColorSpace == CUPS_CSPACE_RGB)
{
......@@ -803,8 +816,11 @@ void DitherProcess(cups_lut_t **Lut, cups_dither_t **DitherState, cups_page_head
}
if(Col == MonitorColour) //0=cyan 1=mag 2=yellow 3=black
{
if (DitherOutputBuffer[x]>MaxOut) MaxOut=DitherOutputBuffer[x];
if (DitherOutputBuffer[x]<MinOut) MinOut=DitherOutputBuffer[x];
for(x=0;x<header->cupsWidth;++x) //added loop structure 17/12/13
{
if (DitherOutputBuffer[x]>MaxOut) MaxOut=DitherOutputBuffer[x];
if (DitherOutputBuffer[x]<MinOut) MinOut=DitherOutputBuffer[x];
}
if(*BlankColour!=0) MinOut=0;
}
//DoLog("DitherProcess BlankColour %d Col %d\n",*BlankColour,Col);
......
......@@ -3,10 +3,20 @@
* Kodak ESP Cxxx (OPL?) Control Language filter for the Common UNIX
* Printing System (CUPS).
*
* copyright Paul Newall May 2010 - Sept 2012. VERSION 2.6 (c2esp26)
* copyright Paul Newall May 2010 - Mar 2013. VERSION 2.7 (c2esp27)
* SUPPORT FOR ESP Cxxxx and Hero SERIES
* patch by user awl29 applied to fix problems with non bi-directional printers, smb shared
* data chunk size limit applied
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Params: job-id user title copies options [file]
* options = "noback" disables all calls to the back channel for testing.
......@@ -24,9 +34,9 @@ KodakPrintLog = text file showing progress of the filter
RasForComp.pbm or ppm = the raster read from cups raster view with image viewer.
KodakUncompressed = The binary page data before compression.
KodakCompPage = The zlib compressed page data
KodakPrintFile = The data that is sent to the printer
KodakPrintFile = The data that is sent to the printer */
#define TESTING 0 TESTING 1 suppresses the output to the printer. Used in development. */
#define TESTING 0 /* TESTING 1 suppresses the output to the printer. Used in development. */
/* #include "config.h" */
#include <cups/raster.h>
......@@ -46,7 +56,7 @@ KodakPrintFile = The data that is sent to the printer
/*
* Constants...
*/
char *Version = "c2espC26";
char *Version = "c2espC27";
/*
* Globals...
......
......@@ -5,6 +5,16 @@
*
* copyright Paul Newall May 2010 - Sept 2012. VERSION 4 (first used in c2esp26)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "config.h"
......
......@@ -6,6 +6,16 @@
*
* copyright Paul Newall May 2010 - Sept 2012. VERSION 3 (first used in c2esp26)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
......
......@@ -4,6 +4,16 @@
*
* Copyright 2011 - Sept 2012 by P.Newall.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Contents:
*
* main() - Main entry and command processing.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/*
* Header file for the portable JBIG compression library
*
* Copyright 1995-2008 -- Markus Kuhn -- http://www.cl.cam.ac.uk/~mgk25/
*
* $Id: jbig.h,v 1.4 2008/09/05 15:05:54 rick Exp $
*/
#ifndef JBG_H
#define JBG_H
#include <stddef.h>
#include "jbig_ar.h"
/*
* JBIG-KIT version number
*/
#define JBG_VERSION "2.0"
/*
* JBIG-KIT licence agreement reference code:
* If you use JBIG-KIT under a commercial licence, please replace
* below the letters GPL with the reference code that you received
* with your licence agreement. (This code is typically a letter "A"
* followed by four decimal digits, e.g. "A1234".)
*/
#define JBG_LICENCE "GPL"
/*
* Buffer block for SDEs which are temporarily stored by encoder
*/
#define JBG_BUFSIZE 4000
struct jbg_buf {