Diff: main.cpp

Revision:

50:86df5e163b08

Parent:

49:843dfe21b2c2

Child:

51:0830f509ed26

diff -r 843dfe21b2c2 -r 86df5e163b08 main.cpp
--- a/main.cpp	Sat Feb 02 14:04:58 2013 +0000
+++ b/main.cpp	Sat Feb 02 14:12:34 2013 +0000
@@ -26,13 +26,14 @@
     fclose(fp); 
      
 }
-void colorCompute(unsigned char*buffer, unsigned int* colorBuffer,int sizeOfBuffer)
+void colorCompute(unsigned char*buffer, int* colorBuffer,int sizeOfBuffer)
 {
     int j=0;
     for(int i=0;i<sizeOfBuffer;i=i+4)
     {
         
-        colorBuffer[j]=RGB((buffer[i])&0xff,buffer[i+1]&0x00,(buffer[i+2])&0x00);
+        //colorBuffer[j]=RGB((buffer[i])&0xff,buffer[i+1]&0x00,(buffer[i+2])&0x00);
+        colorBuffer[j]=RGB((buffer[i]),buffer[i+1],(buffer[i+2]));
         //colorBuffer[j]=((buffer[i]<<11)&0xf800)+((buffer[i+1]<<6)&0x7e0)+((buffer[i+2]>>3)&0x1F);
         //colorBuffer[j]=(0xff<<16)+(0x00<<8)+(0x00);
         //colorBuffer[j]=0xFFFFFF;
@@ -41,7 +42,7 @@
     }
     //printf("\n");
 }
-void pickUpLine(unsigned char*buffer, unsigned int* colorBuffer,int sizeOfBuffer,int sizeOfLine,const char *path, unsigned int *absPtr)
+void pickUpLine(unsigned char*buffer, int* colorBuffer,int sizeOfBuffer,int sizeOfLine,const char *path, unsigned int *absPtr)
 {
     //printf("Pickupline\n");
     superSd(buffer,absPtr,sizeOfBuffer,path);
@@ -51,7 +52,7 @@
     
     //printf("\n");
 }
-void drawLine(unsigned int* color,int y)
+void drawLine(int* color,int y)
 {
     HX8340S_LCD lcd(p9, p14, p13, p11);
     //lcd.Initialize();
@@ -76,7 +77,7 @@
     
     
     unsigned char rawbytes[880];
-    unsigned int color[220];
+    int color[220];
     unsigned int absPtr=54;
     superDisplay();
     for(int i=0;i<176;i++)