From 92c43cf25c0d157df6b86a2b0fa6266ed26f067a Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Mon, 27 Jan 2003 22:05:10 +0000 Subject: [PATCH] Moved PackBits.* to directory ../libprint git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2587 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../print/drivers/canon_lips/lips4/Jamfile | 1 - .../drivers/canon_lips/lips4/PackBits.cpp | 158 ------------------ .../print/drivers/canon_lips/lips4/PackBits.h | 11 -- 3 files changed, 170 deletions(-) delete mode 100644 src/add-ons/print/drivers/canon_lips/lips4/PackBits.cpp delete mode 100644 src/add-ons/print/drivers/canon_lips/lips4/PackBits.h diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile index bead9afedf..5fbdef102a 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile +++ b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile @@ -9,7 +9,6 @@ Addon Canon\ LIPS4\ Compatible : print : Lips4Entry.cpp Lips4.cpp Lips4Cap.cpp - PackBits.cpp ; LinkSharedOSLibs Canon\ LIPS4\ Compatible : be stdc++.r4 libprint.a ; diff --git a/src/add-ons/print/drivers/canon_lips/lips4/PackBits.cpp b/src/add-ons/print/drivers/canon_lips/lips4/PackBits.cpp deleted file mode 100644 index 409025ae7d..0000000000 --- a/src/add-ons/print/drivers/canon_lips/lips4/PackBits.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/* - * PackBits.cpp - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -//#define DBG_CON_STREAM - -#ifdef DBG_CON_STREAM -#include -#endif - -#include -#include "PackBits.h" - -#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) -using namespace std; -#else -#define std -#endif - -#define MAXINBYTES 127 -#define CONTROL1(i) -i -#define CONTROL2(i) i - -enum STATUS { - INITIAL, - UNDECIDED, - UNMATCHED, - MATCHED -}; - -int pack_bits(unsigned char *pOut, unsigned char *pIn, int n) -{ - int i; - unsigned char *control; - unsigned char *runbuf; - unsigned char thisbyte; - unsigned char runbyte; - STATUS status; - - i = 0; - status = INITIAL; - control = runbuf = pOut; - runbyte = *pIn++; - - while (--n) { - thisbyte = *pIn++; - switch (status) { - case INITIAL: - control = runbuf++; - *runbuf++ = runbyte; - if (thisbyte == runbyte) { - status = UNDECIDED; - } else { - runbyte = thisbyte; - status = UNMATCHED; - } - i = 1; - break; - - case UNDECIDED: - if (i == MAXINBYTES) { - *control = CONTROL2(i); - *runbuf++ = runbyte; - runbyte = thisbyte; - status = INITIAL; - } else if (thisbyte == runbyte) { - if (i > 1) { - *control = CONTROL2(i - 2); - control = runbuf - 1; - } - i = 2; - status = MATCHED; - } else { - *runbuf++ = runbyte; - runbyte = thisbyte; - status = UNMATCHED; - i++; - } - break; - - case UNMATCHED: - if (i == MAXINBYTES) { - *control = CONTROL2(i); - status = INITIAL; - } else { - if (thisbyte == runbyte) { - status = UNDECIDED; - } - i++; - } - *runbuf++ = runbyte; - runbyte = thisbyte; - break; - - case MATCHED: - if ((thisbyte != runbyte) || (i == MAXINBYTES)) { - runbuf = control; - *runbuf++ = CONTROL1(i); - *runbuf++ = runbyte; - runbyte = thisbyte; - status = INITIAL; - } else { - i++; - } - break; - } - } - - switch (status) { - case INITIAL: - *runbuf++ = CONTROL2(1); - break; - case UNDECIDED: - case UNMATCHED: - *control = CONTROL2(i); - break; - case MATCHED: - runbuf = control; - *runbuf++ = CONTROL1(i); - break; - } - *runbuf++ = runbyte; - - return runbuf - pOut; -} - -#ifdef DBG_CON_STREAM -int main(int argc, char **argv) -{ - if (argc < 2) { - return -1; - } - - ifstream ifs(*++argv, ios::binary | ios::nocreate); - if (!ifs) { - return -1; - } - - ifs.seekg(0, ios::end); - long size = ifs.tellg(); - ifs.seekg(0, ios::beg); - - unsigned char *pIn = new unsigned char[size]; - unsigned char *pOut = new unsigned char[size * 3]; - - ifs.read(pIn, size); - - int cnt = PackBits(pOut, pIn, size); - - ofstream ofs("test.bin", ios::binary); - ofs.write(pOut, cnt); - - delete [] pIn; - delete [] pOut; - -} -#endif diff --git a/src/add-ons/print/drivers/canon_lips/lips4/PackBits.h b/src/add-ons/print/drivers/canon_lips/lips4/PackBits.h deleted file mode 100644 index faf4ec5083..0000000000 --- a/src/add-ons/print/drivers/canon_lips/lips4/PackBits.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * PackBits.h - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#ifndef __PACKBITS_H -#define __PACKBITS_H - -int pack_bits(unsigned char *out, unsigned char *in, int bytes); - -#endif /* __PACKBITS_H */