summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/bmp2rb.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/bmp2rb.c b/tools/bmp2rb.c
index 1d49dd5bcf..9e80fe563b 100644
--- a/tools/bmp2rb.c
+++ b/tools/bmp2rb.c
@@ -135,7 +135,7 @@ int read_bmp_file(char* filename,
135 close(fd); 135 close(fd);
136 return 2; 136 return 2;
137 } 137 }
138 138
139 compression = readint(&fh.Compression); 139 compression = readint(&fh.Compression);
140 140
141 if (compression != 0) 141 if (compression != 0)
@@ -210,7 +210,7 @@ int read_bmp_file(char* filename,
210 for (row = 0; row < height; row++) 210 for (row = 0; row < height; row++)
211 for (col = 0; col < width; col++) 211 for (col = 0; col < width; col++)
212 { 212 {
213 data = (bmp[(height - 1 - row) * padded_width + col / 2] 213 data = (bmp[(height - 1 - row) * padded_width + col / 2]
214 >> (4 * (~col & 1))) & 0x0F; 214 >> (4 * (~col & 1))) & 0x0F;
215 (*bitmap)[row * width + col] = palette[data]; 215 (*bitmap)[row * width + col] = palette[data];
216 } 216 }
@@ -224,7 +224,7 @@ int read_bmp_file(char* filename,
224 (*bitmap)[row * width + col] = palette[data]; 224 (*bitmap)[row * width + col] = palette[data];
225 } 225 }
226 break; 226 break;
227 227
228 case 16: 228 case 16:
229 for (row = 0; row < height; row++) 229 for (row = 0; row < height; row++)
230 for (col = 0; col < width; col++) 230 for (col = 0; col < width; col++)
@@ -255,7 +255,7 @@ int read_bmp_file(char* filename,
255 case 32: 255 case 32:
256 for (row = 0; row < height; row++) 256 for (row = 0; row < height; row++)
257 for (col = 0; col < width; col++) 257 for (col = 0; col < width; col++)
258 { 258 {
259 i = (height - 1 - row) * padded_width + 4 * col; 259 i = (height - 1 - row) * padded_width + 4 * col;
260 (*bitmap)[row * width + col].rgbRed = bmp[i+2]; 260 (*bitmap)[row * width + col].rgbRed = bmp[i+2];
261 (*bitmap)[row * width + col].rgbGreen = bmp[i+1]; 261 (*bitmap)[row * width + col].rgbGreen = bmp[i+1];
@@ -270,7 +270,7 @@ int read_bmp_file(char* filename,
270 } 270 }
271 271
272 free(bmp); 272 free(bmp);
273 273
274 return 0; /* success */ 274 return 0; /* success */
275} 275}
276 276
@@ -326,7 +326,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
326 dst_h = height; 326 dst_h = height;
327 dst_d = 8; 327 dst_d = 8;
328 break; 328 break;
329 329
330 case 7: /* greyscale X5 remote 4-grey */ 330 case 7: /* greyscale X5 remote 4-grey */
331 dst_w = width; 331 dst_w = width;
332 dst_h = (height + 7) / 8; 332 dst_h = (height + 7) / 8;
@@ -337,7 +337,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
337 debugf("error - Undefined destination format\n"); 337 debugf("error - Undefined destination format\n");
338 return 1; 338 return 1;
339 } 339 }
340 340
341 *dest = (unsigned short *)malloc(dst_w * dst_h * sizeof(short)); 341 *dest = (unsigned short *)malloc(dst_w * dst_h * sizeof(short));
342 if (*dest == NULL) 342 if (*dest == NULL)
343 { 343 {
@@ -355,7 +355,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
355 for (row = 0; row < height; row++) 355 for (row = 0; row < height; row++)
356 for (col = 0; col < width; col++) 356 for (col = 0; col < width; col++)
357 { 357 {
358 (*dest)[(row/8) * dst_w + col] |= 358 (*dest)[(row/8) * dst_w + col] |=
359 (~brightness(src[row * width + col]) & 0x80) >> (~row & 7); 359 (~brightness(src[row * width + col]) & 0x80) >> (~row & 7);
360 } 360 }
361 break; 361 break;
@@ -364,7 +364,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
364 for (row = 0; row < height; row++) 364 for (row = 0; row < height; row++)
365 for (col = 0; col < width; col++) 365 for (col = 0; col < width; col++)
366 { 366 {
367 (*dest)[row * dst_w + (col/8)] |= 367 (*dest)[row * dst_w + (col/8)] |=
368 (~brightness(src[row * width + col]) & 0x80) >> (col & 7); 368 (~brightness(src[row * width + col]) & 0x80) >> (col & 7);
369 } 369 }
370 break; 370 break;
@@ -402,7 +402,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
402 (*dest)[row * dst_w + col] = ((rgb&0xff00)>>8)|((rgb&0x00ff)<<8); 402 (*dest)[row * dst_w + col] = ((rgb&0xff00)>>8)|((rgb&0x00ff)<<8);
403 } 403 }
404 break; 404 break;
405 405
406 case 6: /* greyscale iPods 4-grey */ 406 case 6: /* greyscale iPods 4-grey */
407 for (row = 0; row < height; row++) 407 for (row = 0; row < height; row++)
408 for (col = 0; col < width; col++) 408 for (col = 0; col < width; col++)
@@ -411,19 +411,19 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height,
411 (~brightness(src[row * width + col]) & 0xC0) >> (2 * (col & 3)); 411 (~brightness(src[row * width + col]) & 0xC0) >> (2 * (col & 3));
412 } 412 }
413 break; 413 break;
414 414
415 case 7: /* greyscale X5 remote 4-grey */ 415 case 7: /* greyscale X5 remote 4-grey */
416 for (row = 0; row < height; row++) 416 for (row = 0; row < height; row++)
417 for (col = 0; col < width; col++) 417 for (col = 0; col < width; col++)
418 { 418 {
419 unsigned short data = (~brightness(src[row * width + col]) & 0xC0) >> 6; 419 unsigned short data = (~brightness(src[row * width + col]) & 0xC0) >> 6;
420 420
421 data = (data | (data << 7)) & 0x0101; 421 data = (data | (data << 7)) & 0x0101;
422 (*dest)[(row/8) * dst_w + col] |= data << (row & 7); 422 (*dest)[(row/8) * dst_w + col] |= data << (row & 7);
423 } 423 }
424 break; 424 break;
425 } 425 }
426 426
427 return 0; 427 return 0;
428} 428}
429 429
@@ -620,11 +620,11 @@ int main(int argc, char **argv)
620 case 'a': /* Ascii art */ 620 case 'a': /* Ascii art */
621 ascii = true; 621 ascii = true;
622 break; 622 break;
623 623
624 case 'r': /* Ascii art */ 624 case 'r': /* Raw File */
625 raw = true; 625 raw = true;
626 break; 626 break;
627 627
628 case 'f': 628 case 'f':
629 if (argv[i][2]) 629 if (argv[i][2])
630 { 630 {
@@ -683,7 +683,7 @@ int main(int argc, char **argv)
683 683
684 if (read_bmp_file(bmp_filename, &width, &height, &bitmap)) 684 if (read_bmp_file(bmp_filename, &width, &height, &bitmap))
685 exit(1); 685 exit(1);
686 686
687 687
688 if (ascii) 688 if (ascii)
689 { 689 {