From 4662532382a4cf72d4fce97a9b6c792c5fea40d7 Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Wed, 18 Aug 2004 02:26:08 +0000
Subject: [PATCH] FIX: Compilation on Mac OSX is fine now + remove tabs

---
 src/jpeg/ljpg/decomp.c   |  6 +++---
 src/jpeg/ljpg/huffd.c    |  8 ++++----
 src/jpeg/ljpg/jpegutil.c | 10 +++++-----
 src/jpeg/ljpg/mcu.c      |  6 +++---
 src/jpeg/ljpg/read.c     |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/jpeg/ljpg/decomp.c b/src/jpeg/ljpg/decomp.c
index e06b4cf0..73fd196e 100644
--- a/src/jpeg/ljpg/decomp.c
+++ b/src/jpeg/ljpg/decomp.c
@@ -7,7 +7,7 @@
  * from the Cornell lossless JPEG code
  */
 /*
- * $Id: decomp.c,v 1.2 2003/10/29 18:24:40 malaterre Exp $
+ * $Id: decomp.c,v 1.3 2004/08/18 02:26:08 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,8 +17,8 @@
 #include "mcu.h"
 #include "proto.h"
 
-DecompressInfo  dcInfo;
-StreamIN        JpegInFile;     
+static DecompressInfo  dcInfo;
+static StreamIN        JpegInFile;     
 
 /*
  *--------------------------------------------------------------
diff --git a/src/jpeg/ljpg/huffd.c b/src/jpeg/ljpg/huffd.c
index 6b4bc0b0..92e34562 100644
--- a/src/jpeg/ljpg/huffd.c
+++ b/src/jpeg/ljpg/huffd.c
@@ -5,7 +5,7 @@
  * software
  */
 /*
- * $Id: huffd.c,v 1.2 2004/01/07 10:07:28 regrain Exp $
+ * $Id: huffd.c,v 1.3 2004/08/18 02:26:08 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +26,7 @@ static int  bitsLeft;               /* # of unused bits in it */
  * The following variables keep track of the input buffer
  * for the JPEG data, which is read by ReadJpegData.
  */
-Uchar *inputBuffer;               /* Input buffer for JPEG data */
+Uchar *inputBuffer = 0;           /* Input buffer for JPEG data */
 int inputBufferOffset = 0;        /* Offset of current byte */
 
 /*
@@ -646,7 +646,7 @@ void DecodeImage (DecompressInfo *dcPtr, unsigned short **image, int depth)
 
         /* The upper neighbors are predictors for the first column. */
         for (curComp = 0; curComp < compsInScan; curComp++) 
-                {		
+                {
             ci = dcPtr->MCUmembership[curComp];
             compptr = dcPtr->curCompInfo[ci];
             dctbl = dcPtr->dcHuffTblPtrs[compptr->dcTblNo];
@@ -661,7 +661,7 @@ void DecodeImage (DecompressInfo *dcPtr, unsigned short **image, int depth)
         for (col=1; col < numCOL; col++) 
                 {
             for (curComp = 0; curComp < compsInScan; curComp++) 
-                        {			
+                        {
                 ci = dcPtr->MCUmembership[curComp];
                 compptr = dcPtr->curCompInfo[ci];
                 dctbl = dcPtr->dcHuffTblPtrs[compptr->dcTblNo];
diff --git a/src/jpeg/ljpg/jpegutil.c b/src/jpeg/ljpg/jpegutil.c
index 022332b9..06352ae5 100644
--- a/src/jpeg/ljpg/jpegutil.c
+++ b/src/jpeg/ljpg/jpegutil.c
@@ -5,7 +5,7 @@
  * are stolen from the IJG code
  */
 /*
- * $Id: jpegutil.c,v 1.1 2003/10/21 12:08:54 jpr Exp $
+ * $Id: jpegutil.c,v 1.2 2004/08/18 02:26:08 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,10 +19,10 @@
  * Enough memory is reserved to accomodate up to 1024-wide images
  * with up to 4 components.
  */
-char mcuROW1Memory[1024 * sizeof(MCU)];
-char mcuROW2Memory[1024 * sizeof(MCU)];
-char buf1Memory[1024 * 4 * sizeof(ComponentType)];
-char buf2Memory[1024 * 4 * sizeof(ComponentType)];
+static char mcuROW1Memory[1024 * sizeof(MCU)];
+static char mcuROW2Memory[1024 * sizeof(MCU)];
+static char buf1Memory[1024 * 4 * sizeof(ComponentType)];
+static char buf2Memory[1024 * 4 * sizeof(ComponentType)];
 
 
 unsigned int bitMask[] = {  0xffffffff, 0x7fffffff, 0x3fffffff, 0x1fffffff,
diff --git a/src/jpeg/ljpg/mcu.c b/src/jpeg/ljpg/mcu.c
index 85c4b5e9..067e5abb 100644
--- a/src/jpeg/ljpg/mcu.c
+++ b/src/jpeg/ljpg/mcu.c
@@ -5,7 +5,7 @@
  *
  */
 /*
- * $Id: mcu.c,v 1.1 2003/10/21 12:08:54 jpr Exp $
+ * $Id: mcu.c,v 1.2 2004/08/18 02:26:08 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,12 +14,12 @@
 #include "mcu.h"
 #include "proto.h"
 
-MCU *mcuTable;          /* the global mcu table that buffers the source image */
+MCU *mcuTable=NULL;     /* the global mcu table that buffers the source image */
 
 MCU *mcuROW1=NULL;      /* point to two rows of MCU in encoding & decoding */
 MCU *mcuROW2=NULL;
 
-int numMCU;             /* number of MCUs in mcuTable */
+int numMCU=0;           /* number of MCUs in mcuTable */
 
 /*
  *--------------------------------------------------------------
diff --git a/src/jpeg/ljpg/read.c b/src/jpeg/ljpg/read.c
index 3753d63a..40344ac2 100644
--- a/src/jpeg/ljpg/read.c
+++ b/src/jpeg/ljpg/read.c
@@ -5,7 +5,7 @@
  * from the IJG software
  */
 /*
- * $Id: read.c,v 1.1 2003/10/21 12:08:54 jpr Exp $
+ * $Id: read.c,v 1.2 2004/08/18 02:26:08 malaterre Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,7 +21,7 @@
  * Huffman tables once here, then pointers set later as needed
  */
 
-HuffmanTable HuffmanTableMemory[4];
+static HuffmanTable HuffmanTableMemory[4];
 
 /* 
  * Enumerate all the JPEG marker codes
-- 
2.45.1