Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Sat Jun 24 20:35:51 CEST 2006
Subject: [cvs-checkins] MODIFIED: mb-jpeg ...
Date: 00/06/06 24:20:35

Modified: mb-jpeg/decoder decoder.c JpegToBmp.c mb-jpeg.h
Log:
The shell and reference code are modified to be compiled on both Microblaze and Cygwin on WinXP.

1. To compile on Microblaze, two predefine are used, __MICROBLAZE and __XUPV2P.

2. To compile on Cygwin, use "gcc -std=c99 -o decoder.exe jpegtobmp.c decoder.c"


Revision Changes Path
1.2 mb-jpeg/decoder/decoder.c

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/decoder.c.diff?r1=1.1&r2=1.2

(In the diff below, changes in quantity of whitespace are not shown.)

Index: decoder.c
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/decoder/decoder.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- decoder.c 24 Jun 2006 18:06:33 -0000 1.1
+++ decoder.c 24 Jun 2006 18:35:51 -0000 1.2
@@ -1,10 +1,12 @@
+#include <stdio.h>
+#include <stdlib.h>

#include "mb-jpeg.h"

unsigned char* jpgimage;
unsigned long jpgsize;
unsigned char* bmpimage;
-unsigned long bmpsize;
+unsigned long mpsize;

int main() {
SYSACE_FILE *jpgfile;



1.3 mb-jpeg/decoder/JpegToBmp.c

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/JpegToBmp.c.diff?r1=1.2&r2=1.3

(In the diff below, changes in quantity of whitespace are not shown.)

Index: JpegToBmp.c
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/decoder/JpegToBmp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- JpegToBmp.c 24 Jun 2006 18:06:33 -0000 1.2
+++ JpegToBmp.c 24 Jun 2006 18:35:51 -0000 1.3
@@ -46,6 +46,9 @@
/* MAIN MAIN MAIN */
/*-----------------------------------------------------------------*/

+#define file1 "image01.jpg"
+#define file2 "image01.bmp"
+
int decode(void)
{
char *p;
@@ -55,7 +58,7 @@

fi = fopen(file1,"rb");
if (fi == NULL) {
- MessageBox(0,"unable to open the file",file1,0);
+ printf("unable to open the file\r\n");
return 0;
}




1.2 mb-jpeg/decoder/mb-jpeg.h

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/mb-jpeg.h.diff?r1=1.1&r2=1.2

(In the diff below, changes in quantity of whitespace are not shown.)

Index: mb-jpeg.h
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/decoder/mb-jpeg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mb-jpeg.h 24 Jun 2006 18:06:33 -0000 1.1
+++ mb-jpeg.h 24 Jun 2006 18:35:51 -0000 1.2
@@ -3,17 +3,24 @@

// Microblaze related declaration

+#ifdef __MICROBLAZE
#include <xparameters.h>
#include <sysace_stdio.h>

#include "xio.h"
+#endif // XUP2P board related declaration +#ifdef __XUPV2P #define JPG_ADDRESS 0x70000000 #define JPG_MAXSIZE 0x4000 #define BMP_ADDRESS 0x70000800 #define BMP_MAXSIZE 0x1c000 +#else +#define JPG_MAXSIZE 0x400000 +#define BMP_MAXSIZE 0x1c00000 +#endif // JPEG decoder related declaration