Changeset 16809
- Timestamp:
- 06/23/12 13:21:08 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/fb.h
r16747 r16809 410 410 411 411 convert_and_write(buf_p, outfile, width, height, bitdepth, interlace); 412 413 414 return 0; 415 } 416 417 void pngforlcd(char *fbuffer, int width, int height) 412 413 return 0; 414 } 415 416 void pngforlcd(unsigned char *fbuffer, int width, int height) 418 417 { 419 418 fb2png(fbuffer, width, height, "/tmp/titanlcd.png"); -
titan/titan/skin.h
r16790 r16809 3788 3788 if(lcdskinfb == NULL) { 3789 3789 if(node->name != NULL && ostrstr(node->name, "LCD_spf87") != NULL) { 3790 //char *newskinfb = malloc(4 * 800 * 480); 3791 char *newskinfb = calloc(1, 4 * 800 * 480); 3790 unsigned char *newskinfb = calloc(1, 4 * 800 * 480); 3792 3791 if(newskinfb == NULL) 3792 { 3793 if(flag == 0 || flag == 4) 3794 m_lock(&status.drawingmutex, 0); 3793 3795 return -2; 3796 } 3794 3797 lcdskinfb = addfb("lcdskinfb", 999, 800, 480, 4, -1, newskinfb, 4 * 800 * 480); 3795 3798 } 3796 3799 else { 3797 //char *newskinfb = malloc(4 * 320 * 240); 3798 char *newskinfb = calloc(1, 4 * 320 * 240); 3800 unsigned char *newskinfb = calloc(1, 4 * 320 * 240); 3799 3801 if(newskinfb == NULL) 3802 { 3803 if(flag == 0 || flag == 4) 3804 m_lock(&status.drawingmutex, 0); 3800 3805 return -2; 3806 } 3801 3807 lcdskinfb = addfb("lcdskinfb", 999, 320, 240, 4, -1, newskinfb, 4 * 320 * 240); 3802 3808 } … … 3862 3868 skinfb = merkskinfb; 3863 3869 merkskinfb = NULL; 3864 delfb( lcdskinfb);3870 delfb("lcdskinfb"); 3865 3871 lcdskinfb = NULL; 3866 3872 }
Note: See TracChangeset
for help on using the changeset viewer.