io-bmp.c 18.8 KB
Newer Older
1 2 3
/* GdkPixbuf library - Windows Bitmap image loader
 *
 * Copyright (C) 1999 The Free Software Foundation
Mark Crichton's avatar
Mark Crichton committed
4
 *
5 6 7 8
 * Authors: Arjan van de Ven <arjan@fenrus.demon.nl>
 *          Federico Mena-Quintero <federico@gimp.org>
 *
 * Based on io-ras.c
Mark Crichton's avatar
Mark Crichton committed
9 10 11 12 13 14 15 16 17 18 19 20
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
 *
 * You should have received a copy of the GNU Library General Public
21 22 23
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
Mark Crichton's avatar
Mark Crichton committed
24 25
 */

26 27 28
/*

Known bugs:
29 30
	* 4bpp compressed files don't work
	* bi-tonal files aren't tested with palettes
31 32 33

*/

Mark Crichton's avatar
Mark Crichton committed
34 35
#include <config.h>
#include <stdio.h>
36
#include <unistd.h>
37
#include <string.h>
38 39
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf-io.h>
40 41 42



43

44

45 46 47
/* 

These structures are actually dummies. These are according to
48 49 50
the "Windows API reference guide volume II" as written by 
Borland International, but GCC fiddles with the alignment of 
the internal members, so these aren't actually usable.
51 52 53

*/

54
struct BitmapFileHeader {
55 56 57 58
	gushort bfType;
	guint bfSize;
	guint reserverd;
	guint bfOffbits;
59 60 61
};

struct BitmapInfoHeader {
62 63 64 65 66 67 68 69 70 71 72
	guint biSize;
	guint biWidth;
	guint biHeight;
	gushort biPlanes;
	gushort biBitCount;
	guint biCompression;
	guint biSizeImage;
	guint biXPelsPerMeter;
	guint biYPelsPerMeter;
	guint biClrUsed;
	guint biClrImportant;
73 74
};

75 76 77 78 79 80 81
/* 

DumpBIH printf's the values in a BitmapInfoHeader to the screen, for 
debugging purposes.

*/
#if DUMPBIH
82
static void DumpBIH(unsigned char *BIH)
83
{
84
	printf("biSize      = %i \n",
85 86
	       (int) (BIH[3] << 24) + (BIH[2] << 16) + (BIH[1] << 8) +
	       (BIH[0]));
87
	printf("biWidth     = %i \n",
88 89
	       (int) (BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) +
	       (BIH[4]));
90
	printf("biHeight    = %i \n",
91
	       (int) (BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) +
92
	       (BIH[8]));
93 94
	printf("biPlanes    = %i \n", (int) (BIH[13] << 8) + (BIH[12]));
	printf("biBitCount  = %i \n", (int) (BIH[15] << 8) + (BIH[14]));
95
	printf("biCompress  = %i \n",
96
	       (int) (BIH[19] << 24) + (BIH[18] << 16) + (BIH[17] << 8) +
97 98
	       (BIH[16]));
	printf("biSizeImage = %i \n",
99
	       (int) (BIH[23] << 24) + (BIH[22] << 16) + (BIH[21] << 8) +
100 101
	       (BIH[20]));
	printf("biXPels     = %i \n",
102
	       (int) (BIH[27] << 24) + (BIH[26] << 16) + (BIH[25] << 8) +
103 104
	       (BIH[24]));
	printf("biYPels     = %i \n",
105
	       (int) (BIH[31] << 24) + (BIH[30] << 16) + (BIH[29] << 8) +
106 107
	       (BIH[28]));
	printf("biClrUsed   = %i \n",
108
	       (int) (BIH[35] << 24) + (BIH[34] << 16) + (BIH[33] << 8) +
109 110
	       (BIH[32]));
	printf("biClrImprtnt= %i \n",
111
	       (int) (BIH[39] << 24) + (BIH[38] << 16) + (BIH[37] << 8) +
112 113
	       (BIH[36]));
}
114 115 116
#endif
/* struct headerpair contains the decoded width/height/depth info for
   the current bitmap */
117

118 119 120 121 122 123 124
struct headerpair {
	guint width;
	guint height;
	guint depth;
	guint Negative;		/* Negative = 1 -> top down BMP,  
				   Negative = 0 -> bottom up BMP */
};
125

126 127 128 129 130 131 132 133 134 135 136 137 138 139
/* Data needed for the "state" during decompression */
struct bmp_compression_state {
	gint phase;		/* 0 = clean, 
				   1 = count received
				   2 = escape received
				   3 = in "raw" run
				   4 = Relative part 1 is next
				   5 = Relative part 2 is next
				   6 = end of image -> No more input allowed
				 */
	gint RunCount;
	gint XDelta;
	gint YDelta;
};
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157

/* Progressive loading */

struct bmp_progressive_state {
	ModulePreparedNotifyFunc prepared_func;
	ModuleUpdatedNotifyFunc updated_func;
	gpointer user_data;

	gint HeaderSize;	/* The size of the header-part (incl colormap) */
	guchar *HeaderBuf;	/* The buffer for the header (incl colormap) */
	gint HeaderDone;	/* The nr of bytes actually in HeaderBuf */

	gint LineWidth;		/* The width of a line in bytes */
	guchar *LineBuf;	/* Buffer for 1 line */
	gint LineDone;		/* # of bytes in LineBuf */
	gint Lines;		/* # of finished lines */

	gint Type;		/*  
158
				   32 = RGB + alpha
159
				   24 = RGB
160 161
				   4  = 4 bpp colormapped
				   8  = 8 bpp colormapped
162 163
				   1  = 1 bit bitonal 
				 */
164 165
	gint Compressed;
	struct bmp_compression_state compr;
166 167 168 169 170 171 172 173 174


	struct headerpair Header;	/* Decoded (BE->CPU) header */


	GdkPixbuf *pixbuf;	/* Our "target" */
};

gpointer
Federico Mena Quintero's avatar
Federico Mena Quintero committed
175 176 177
gdk_pixbuf__bmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
				 ModuleUpdatedNotifyFunc updated_func,
				 ModuleFrameDoneNotifyFunc frame_done_func,
178 179
				 ModuleAnimationDoneNotifyFunc
				 anim_done_func, gpointer user_data);
Federico Mena Quintero's avatar
Federico Mena Quintero committed
180 181

void gdk_pixbuf__bmp_image_stop_load(gpointer data);
182 183
gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf,
					      guint size);
184

Mark Crichton's avatar
Mark Crichton committed
185 186


187 188
/* Shared library entry point --> This should be removed when
   generic_image_load enters gdk-pixbuf-io. */
Federico Mena Quintero's avatar
Federico Mena Quintero committed
189
GdkPixbuf *gdk_pixbuf__bmp_image_load(FILE * f)
Mark Crichton's avatar
Mark Crichton committed
190
{
191 192 193
	guchar *membuf;
	size_t length;
	struct bmp_progressive_state *State;
194

195
	GdkPixbuf *pb;
196

197 198
	State =
	    gdk_pixbuf__bmp_image_begin_load(NULL, NULL, NULL, NULL, NULL);
199
	membuf = g_malloc(4096);
200

201
	g_assert(membuf != NULL);
202 203


204 205
	while (feof(f) == 0) {
		length = fread(membuf, 1, 4096, f);
206
		if (length > 0)
207 208 209 210 211

			(void)
			    gdk_pixbuf__bmp_image_load_increment(State,
								 membuf,
								 length);
212 213

	}
214 215 216 217 218 219
	g_free(membuf);
	if (State->pixbuf != NULL)
		gdk_pixbuf_ref(State->pixbuf);

	pb = State->pixbuf;

Federico Mena Quintero's avatar
Federico Mena Quintero committed
220
	gdk_pixbuf__bmp_image_stop_load(State);
221
	return pb;
222 223
}

224 225
static void DecodeHeader(unsigned char *BFH, unsigned char *BIH,
			 struct bmp_progressive_state *State)
226
{
227 228 229 230
#if DUMPBIH
	DumpBIH(BIH);
#endif

231
	State->Header.width =
232 233
	    (int) (BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) +
	    (BIH[4]);
234
	State->Header.height =
235 236 237
	    (int) (BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) +
	    (BIH[8]);
	State->Header.depth = (int) (BIH[15] << 8) + (BIH[14]);;
238 239

	State->Type = State->Header.depth;	/* This may be less trivial someday */
240
	State->HeaderSize =
241 242 243 244 245
	    (int) ((BFH[13] << 24) + (BFH[12] << 16) + (BFH[11] << 8) +
		   (BFH[10]));
	if (State->HeaderSize >= 14 + 40 + 1024)
		State->HeaderBuf =
		    g_realloc(State->HeaderBuf, State->HeaderSize);
246 247 248 249 250 251

	if ((BIH[16] != 0) || (BIH[17] != 0) || (BIH[18] != 0)
	    || (BIH[19] != 0)) {
		State->Compressed = 1;
	}

252
	/* Negative heights indicates bottom-down pixelorder */
253 254 255 256 257 258 259 260
	if (State->Header.height < 0) {
		State->Header.height = -State->Header.height;
		State->Header.Negative = 1;
	}
	if (State->Header.width < 0) {
		State->Header.width = -State->Header.width;
		State->Header.Negative = 0;
	}
261

262 263
	if (State->Type == 32)
		State->LineWidth = State->Header.width * 4;
264 265 266 267
	if (State->Type == 24)
		State->LineWidth = State->Header.width * 3;
	if (State->Type == 8)
		State->LineWidth = State->Header.width * 1;
268 269
	if (State->Type == 4)
		State->LineWidth = (State->Header.width + 1) / 2;
270 271 272 273 274
	if (State->Type == 1) {
		State->LineWidth = State->Header.width / 8;
		if ((State->Header.width & 7) != 0)
			State->LineWidth++;
	}
275

276
	/* Pad to a 32 bit boundary */
277 278 279
	if (((State->LineWidth % 4) > 0) && (State->Compressed == 0))
		State->LineWidth = (State->LineWidth / 4) * 4 + 4;

280 281 282 283 284 285 286 287

	if (State->LineBuf == NULL)
		State->LineBuf = g_malloc(State->LineWidth);

	g_assert(State->LineBuf != NULL);


	if (State->pixbuf == NULL) {
288 289 290 291 292 293 294 295 296 297
		if (State->Type == 32)
			State->pixbuf =
			    gdk_pixbuf_new(ART_PIX_RGB, TRUE, 8,
					   (gint) State->Header.width,
					   (gint) State->Header.height);
		else
			State->pixbuf =
			    gdk_pixbuf_new(ART_PIX_RGB, FALSE, 8,
					   (gint) State->Header.width,
					   (gint) State->Header.height);
298

299 300
		if (State->prepared_func != NULL)
			/* Notify the client that we are ready to go */
301
			(*State->prepared_func) (State->pixbuf, State->user_data);
302 303

	}
304

305 306 307 308 309 310 311 312 313
}

/* 
 * func - called when we have pixmap created (but no image data)
 * user_data - passed as arg 1 to func
 * return context (opaque to user)
 */

gpointer
Federico Mena Quintero's avatar
Federico Mena Quintero committed
314 315 316
gdk_pixbuf__bmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
				 ModuleUpdatedNotifyFunc updated_func,
				 ModuleFrameDoneNotifyFunc frame_done_func,
317 318
				 ModuleAnimationDoneNotifyFunc
				 anim_done_func, gpointer user_data)
319 320 321 322 323 324 325 326 327
{
	struct bmp_progressive_state *context;

	context = g_new0(struct bmp_progressive_state, 1);
	context->prepared_func = prepared_func;
	context->updated_func = updated_func;
	context->user_data = user_data;

	context->HeaderSize = 54;
328 329 330 331
	context->HeaderBuf = g_malloc(14 + 40 + 1024);
	/* 14 for the BitmapFileHeader, 40 for the BitmapImageHeader and 
	   1024 for the colormap */

332 333 334 335 336 337 338 339 340 341
	context->HeaderDone = 0;

	context->LineWidth = 0;
	context->LineBuf = NULL;
	context->LineDone = 0;
	context->Lines = 0;

	context->Type = 0;

	memset(&context->Header, 0, sizeof(struct headerpair));
342
	memset(&context->compr, 0, sizeof(struct bmp_compression_state));
343 344 345 346 347 348 349 350 351 352 353 354 355


	context->pixbuf = NULL;


	return (gpointer) context;
}

/*
 * context - returned from image_begin_load
 *
 * free context, unref gdk_pixbuf
 */
Federico Mena Quintero's avatar
Federico Mena Quintero committed
356
void gdk_pixbuf__bmp_image_stop_load(gpointer data)
357 358 359 360 361 362 363 364 365
{
	struct bmp_progressive_state *context =
	    (struct bmp_progressive_state *) data;


	g_return_if_fail(context != NULL);

	if (context->LineBuf != NULL)
		g_free(context->LineBuf);
366
	context->LineBuf = NULL;
367

368 369
	if (context->HeaderBuf != NULL)
		g_free(context->HeaderBuf);
370
	context->LineBuf = NULL;
371 372 373 374 375 376 377 378

	if (context->pixbuf)
		gdk_pixbuf_unref(context->pixbuf);

	g_free(context);
}


379 380 381 382 383 384 385 386 387 388 389 390 391 392 393
/*
The OneLineXX functions are called when 1 line worth of data is present.
OneLine24 is the 24 bpp-version.
*/
static void OneLine32(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
	if (context->Header.Negative == 0)
		Pixels = context->pixbuf->art_pixbuf->pixels +
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    (context->Header.height - context->Lines - 1);
	else
394 395
		Pixels =
		    context->pixbuf->art_pixbuf->pixels +
396 397 398 399 400 401 402 403 404 405 406 407
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    context->Lines;
	while (X < context->Header.width) {
		Pixels[X * 4 + 0] = context->LineBuf[X * 4 + 2];
		Pixels[X * 4 + 1] = context->LineBuf[X * 4 + 1];
		Pixels[X * 4 + 2] = context->LineBuf[X * 4 + 0];
		Pixels[X * 4 + 3] = context->LineBuf[X * 4 + 3];
		X++;
	}

}

408 409 410 411 412 413
static void OneLine24(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
414 415 416 417 418
	if (context->Header.Negative == 0)
		Pixels = context->pixbuf->art_pixbuf->pixels +
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    (context->Header.height - context->Lines - 1);
	else
419 420
		Pixels =
		    context->pixbuf->art_pixbuf->pixels +
421 422
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    context->Lines;
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437
	while (X < context->Header.width) {
		Pixels[X * 3 + 0] = context->LineBuf[X * 3 + 2];
		Pixels[X * 3 + 1] = context->LineBuf[X * 3 + 1];
		Pixels[X * 3 + 2] = context->LineBuf[X * 3 + 0];
		X++;
	}

}

static void OneLine8(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
438 439 440 441 442
	if (context->Header.Negative == 0)
		Pixels = context->pixbuf->art_pixbuf->pixels +
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    (context->Header.height - context->Lines - 1);
	else
443 444
		Pixels =
		    context->pixbuf->art_pixbuf->pixels +
445 446
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    context->Lines;
447 448
	while (X < context->Header.width) {
		Pixels[X * 3 + 0] =
449
		    context->HeaderBuf[4 * context->LineBuf[X] + 56];
450
		Pixels[X * 3 + 1] =
451
		    context->HeaderBuf[4 * context->LineBuf[X] + 55];
452
		Pixels[X * 3 + 2] =
453
		    context->HeaderBuf[4 * context->LineBuf[X] + 54];
454 455 456 457
		X++;
	}
}

458 459 460 461 462 463 464 465 466 467 468
static void OneLine4(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
	if (context->Header.Negative == 0)
		Pixels = context->pixbuf->art_pixbuf->pixels +
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    (context->Header.height - context->Lines - 1);
	else
469 470
		Pixels =
		    context->pixbuf->art_pixbuf->pixels +
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    context->Lines;

	while (X < context->Header.width) {
		guchar Pix;

		Pix = context->LineBuf[X / 2];

		Pixels[X * 3 + 0] =
		    context->HeaderBuf[4 * (Pix >> 4) + 56];
		Pixels[X * 3 + 1] =
		    context->HeaderBuf[4 * (Pix >> 4) + 55];
		Pixels[X * 3 + 2] =
		    context->HeaderBuf[4 * (Pix >> 4) + 54];
		X++;
		if (X < context->Header.width) {
			/* Handle the other 4 bit pixel only when there is one */
			Pixels[X * 3 + 0] =
			    context->HeaderBuf[4 * (Pix & 15) + 56];
			Pixels[X * 3 + 1] =
			    context->HeaderBuf[4 * (Pix & 15) + 55];
			Pixels[X * 3 + 2] =
			    context->HeaderBuf[4 * (Pix & 15) + 54];
			X++;
		}
	}

}

500 501 502 503 504 505
static void OneLine1(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
506 507 508 509 510
	if (context->Header.Negative == 0)
		Pixels = context->pixbuf->art_pixbuf->pixels +
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    (context->Header.height - context->Lines - 1);
	else
511 512
		Pixels =
		    context->pixbuf->art_pixbuf->pixels +
513 514
		    gdk_pixbuf_get_rowstride(context->pixbuf) *
		    context->Lines;
515
	while (X < context->Header.width) {
516
		gint Bit;
517 518

		Bit = (context->LineBuf[X / 8]) >> (7 - (X & 7));
519
		Bit = Bit & 1;
520 521 522
		Pixels[X * 3 + 0] = Bit * 255;
		Pixels[X * 3 + 1] = Bit * 255;
		Pixels[X * 3 + 2] = Bit * 255;
523 524 525 526 527 528 529
		X++;
	}
}


static void OneLine(struct bmp_progressive_state *context)
{
530 531 532 533
	context->LineDone = 0;
	if (context->Lines >= context->Header.height)
		return;

534 535
	if (context->Type == 32)
		OneLine32(context);
536 537 538 539
	if (context->Type == 24)
		OneLine24(context);
	if (context->Type == 8)
		OneLine8(context);
540 541
	if (context->Type == 4)
		OneLine4(context);
542 543 544 545 546 547 548 549 550 551
	if (context->Type == 1)
		OneLine1(context);

	context->Lines++;

	if (context->updated_func != NULL) {
		(*context->updated_func) (context->pixbuf,
					  0,
					  context->Lines,
					  context->Header.width,
552 553
					  context->Header.height,
					  context->user_data);
554 555 556 557

	}
}

558 559 560 561 562 563 564
/* DoCompressedByte handles 1 byte of incomming compressed data */
void DoCompressedByte(struct bmp_progressive_state *context, guchar ** buf,
		      gint * size)
{
	gint BytesToCopy;
	switch (context->compr.phase) {
	case 0:		/* Neutral state */
565
		if ((*buf)[0] != 0) {	/* run count */
566 567
			context->compr.phase = 1;
			context->compr.RunCount = (*buf)[0];
568

569 570 571 572 573 574 575 576 577 578 579 580 581 582
		} else {	/* Escape */
			context->compr.phase = 2;
		}
		(*buf)++;
		(*size)--;
		break;
	case 1:		/* Run count received.... */
		while (context->compr.RunCount > 0) {
			BytesToCopy =
			    context->LineWidth - context->LineDone;
			if (BytesToCopy > context->compr.RunCount)
				BytesToCopy = context->compr.RunCount;
			if (BytesToCopy > 0) {
				memset(context->LineBuf +
583 584
				       context->LineDone, (*buf)[0],
				       BytesToCopy);
585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612

				context->compr.RunCount -= BytesToCopy;
				context->LineDone += BytesToCopy;
			}
			if ((context->LineDone >= context->LineWidth)
			    && (context->LineWidth > 0)) {
				OneLine(context);
			}
		}
		context->compr.phase = 0;
		(*buf)++;
		(*size)--;
		break;
	case 2:		/* Escape received */
		if ((*buf)[0] == 0) {	/* End of line */
			context->compr.phase = 0;
			if (context->LineDone > 0)
				OneLine(context);
		} else if ((*buf)[0] == 1) {	/* End of image */
			OneLine(context);
			context->compr.phase = 6;
			(*size) = 0;
			break;
		} else if ((*buf)[0] == 2) {	/* Cursor displacement */
			context->compr.phase = 4;
		} else {
			context->compr.phase = 3;
			context->compr.RunCount = (*buf)[0];
613 614 615
			if (context->compr.RunCount & 1)
				context->compr.phase = 7;

616 617 618 619 620 621 622
		}
		(*buf)++;
		(*size)--;

		break;
	case 3:
		while ((context->compr.RunCount > 0)
623
		       && (*size > 0)) {
624 625 626 627 628 629 630 631 632
			BytesToCopy =
			    context->LineWidth - context->LineDone;
			if (BytesToCopy > context->compr.RunCount)
				BytesToCopy = context->compr.RunCount;
			if (BytesToCopy > *size)
				BytesToCopy = *size;

			if (BytesToCopy > 0) {
				memcpy(context->LineBuf +
633 634
				       context->LineDone, *buf,
				       BytesToCopy);
635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665

				context->compr.RunCount -= BytesToCopy;
				(*buf) += BytesToCopy;
				(*size) -= BytesToCopy;
				context->LineDone += BytesToCopy;
			}
			if ((context->LineDone >= context->LineWidth)
			    && (context->LineWidth > 0))
				OneLine(context);
		}
		if (context->compr.RunCount <= 0)
			context->compr.phase = 0;

		break;
	case 4:
		context->compr.phase = 5;
		context->compr.XDelta = (*buf)[0];
		(*buf)++;
		(*size)--;
		break;
	case 5:
		context->compr.phase = 0;
		context->compr.YDelta = (*buf)[0];
		g_assert(0);	/* No implementatio of this yet */
		/* If this happens, please email me (arjan@fenrus.demon.nl)
		   the image concerned. */
		(*buf)++;
		(*size)--;
		break;
	case 6:
		(*size) = 0;
666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698
		break;
	case 7:		/* Odd raw run */
		while ((context->compr.RunCount > 0) && (*size > 0)) {
			BytesToCopy =
			    context->LineWidth - context->LineDone;
			if (BytesToCopy > context->compr.RunCount)
				BytesToCopy = context->compr.RunCount;
			if (BytesToCopy > *size)
				BytesToCopy = *size;

			if (BytesToCopy > 0) {
				memcpy(context->LineBuf +
				       context->LineDone, *buf,
				       BytesToCopy);

				context->compr.RunCount -= BytesToCopy;
				(*buf) += BytesToCopy;
				(*size) -= BytesToCopy;
				context->LineDone += BytesToCopy;
			}
			if ((context->LineDone >= context->LineWidth)
			    && (context->LineWidth > 0))
				OneLine(context);
		}
		if (context->compr.RunCount <= 0)
			context->compr.phase = 8;

		break;
	case 8:		/* Eat dummy byte; */
		(*buf)++;
		(*size)--;
		context->compr.phase = 0;
		break;
699 700 701
	}
}

702 703 704 705 706 707 708
/*
 * context - from image_begin_load
 * buf - new image data
 * size - length of new image data
 *
 * append image data onto inrecrementally built output image
 */
709 710
gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf,
					      guint size)
711 712 713 714 715 716 717
{
	struct bmp_progressive_state *context =
	    (struct bmp_progressive_state *) data;

	gint BytesToCopy;

	while (size > 0) {
718
		g_assert(context->LineDone >= 0);
719 720 721 722 723 724 725
		if (context->HeaderDone < context->HeaderSize) {	/* We still 
									   have headerbytes to do */
			BytesToCopy =
			    context->HeaderSize - context->HeaderDone;
			if (BytesToCopy > size)
				BytesToCopy = size;

726
			memmove(context->HeaderBuf + context->HeaderDone,
727
				buf, BytesToCopy);
728 729 730 731 732

			size -= BytesToCopy;
			buf += BytesToCopy;
			context->HeaderDone += BytesToCopy;

733
		} else if (context->Compressed) {
734 735
			/* Compression is done 1 byte at a time for now */
			DoCompressedByte(context, &buf, &size);
736

737
		} else {
738
			/* Uncompressed pixeldata */
739 740 741 742 743 744
			BytesToCopy =
			    context->LineWidth - context->LineDone;
			if (BytesToCopy > size)
				BytesToCopy = size;

			if (BytesToCopy > 0) {
745
				memmove(context->LineBuf +
746 747
					context->LineDone, buf,
					BytesToCopy);
748 749 750 751 752

				size -= BytesToCopy;
				buf += BytesToCopy;
				context->LineDone += BytesToCopy;
			}
753 754
			if ((context->LineDone >= context->LineWidth)
			    && (context->LineWidth > 0))
755 756 757 758 759
				OneLine(context);


		}

760 761 762
		if (context->HeaderDone >= 14 + 40)
			DecodeHeader(context->HeaderBuf,
				     context->HeaderBuf + 14, context);
Mark Crichton's avatar
Mark Crichton committed
763 764


765
	}
Mark Crichton's avatar
Mark Crichton committed
766

767
	return TRUE;
Mark Crichton's avatar
Mark Crichton committed
768
}