io-bmp.c 18.4 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
 *
 * This library is free software; you can redistribute it and/or
11
 * modify it under the terms of the GNU Lesser General Public
Mark Crichton's avatar
Mark Crichton committed
12 13 14 15 16 17
 * 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
18
 * Lesser General Public License for more details.
Mark Crichton's avatar
Mark Crichton committed
19
 *
20
 * You should have received a copy of the GNU Lesser 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-private.h"
#include "gdk-pixbuf-io.h"
40

41

42

43 44 45
/* 

These structures are actually dummies. These are according to
46 47 48
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.
49 50 51

*/

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

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

73 74 75 76 77 78 79
/* 

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

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

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

124 125 126 127 128 129 130 131 132 133 134 135 136 137
/* 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;
};
138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155

/* 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;		/*  
156
				   32 = RGB + alpha
157
				   24 = RGB
158 159
				   4  = 4 bpp colormapped
				   8  = 8 bpp colormapped
160 161
				   1  = 1 bit bitonal 
				 */
162 163
	gint Compressed;
	struct bmp_compression_state compr;
164 165 166 167 168 169 170 171 172


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


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

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

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

Mark Crichton's avatar
Mark Crichton committed
183 184


185 186
/* 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
187
GdkPixbuf *gdk_pixbuf__bmp_image_load(FILE * f)
Mark Crichton's avatar
Mark Crichton committed
188
{
189
	guchar membuf[4096];
190 191
	size_t length;
	struct bmp_progressive_state *State;
192

193
	GdkPixbuf *pb;
194

195 196
	State =
	    gdk_pixbuf__bmp_image_begin_load(NULL, NULL, NULL, NULL, NULL);
197

198 199
	while (feof(f) == 0) {
		length = fread(membuf, 1, 4096, f);
200
		if (length > 0)
201 202 203 204
			(void)
			    gdk_pixbuf__bmp_image_load_increment(State,
								 membuf,
								 length);
205 206

	}
207 208 209 210 211
	if (State->pixbuf != NULL)
		gdk_pixbuf_ref(State->pixbuf);

	pb = State->pixbuf;

Federico Mena Quintero's avatar
Federico Mena Quintero committed
212
	gdk_pixbuf__bmp_image_stop_load(State);
213
	return pb;
214 215
}

216 217
static void DecodeHeader(unsigned char *BFH, unsigned char *BIH,
			 struct bmp_progressive_state *State)
218
{
219 220 221 222
#if DUMPBIH
	DumpBIH(BIH);
#endif

223
	State->Header.width =
224 225
	    (int) (BIH[7] << 24) + (BIH[6] << 16) + (BIH[5] << 8) +
	    (BIH[4]);
226
	State->Header.height =
227 228 229
	    (int) (BIH[11] << 24) + (BIH[10] << 16) + (BIH[9] << 8) +
	    (BIH[8]);
	State->Header.depth = (int) (BIH[15] << 8) + (BIH[14]);;
230 231

	State->Type = State->Header.depth;	/* This may be less trivial someday */
232
	State->HeaderSize =
233 234 235 236 237
	    (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);
238 239 240 241 242 243

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

244
	/* Negative heights indicates bottom-down pixelorder */
245 246 247 248 249 250 251 252
	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;
	}
253

254 255
	if (State->Type == 32)
		State->LineWidth = State->Header.width * 4;
256 257 258 259
	if (State->Type == 24)
		State->LineWidth = State->Header.width * 3;
	if (State->Type == 8)
		State->LineWidth = State->Header.width * 1;
260 261
	if (State->Type == 4)
		State->LineWidth = (State->Header.width + 1) / 2;
262 263 264 265 266
	if (State->Type == 1) {
		State->LineWidth = State->Header.width / 8;
		if ((State->Header.width & 7) != 0)
			State->LineWidth++;
	}
267

268
	/* Pad to a 32 bit boundary */
269 270 271
	if (((State->LineWidth % 4) > 0) && (State->Compressed == 0))
		State->LineWidth = (State->LineWidth / 4) * 4 + 4;

272 273 274 275 276 277 278 279

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

	g_assert(State->LineBuf != NULL);


	if (State->pixbuf == NULL) {
280 281
		if (State->Type == 32)
			State->pixbuf =
282
			    gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
283 284 285 286
					   (gint) State->Header.width,
					   (gint) State->Header.height);
		else
			State->pixbuf =
287
			    gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
288 289
					   (gint) State->Header.width,
					   (gint) State->Header.height);
290

291 292
		if (State->prepared_func != NULL)
			/* Notify the client that we are ready to go */
293
			(*State->prepared_func) (State->pixbuf, State->user_data);
294 295

	}
296

297 298 299 300 301 302 303 304 305
}

/* 
 * 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
306 307 308
gdk_pixbuf__bmp_image_begin_load(ModulePreparedNotifyFunc prepared_func,
				 ModuleUpdatedNotifyFunc updated_func,
				 ModuleFrameDoneNotifyFunc frame_done_func,
309 310
				 ModuleAnimationDoneNotifyFunc
				 anim_done_func, gpointer user_data)
311 312 313 314 315 316 317 318 319
{
	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;
320 321 322 323
	context->HeaderBuf = g_malloc(14 + 40 + 1024);
	/* 14 for the BitmapFileHeader, 40 for the BitmapImageHeader and 
	   1024 for the colormap */

324 325 326 327 328 329 330 331 332 333
	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));
334
	memset(&context->compr, 0, sizeof(struct bmp_compression_state));
335 336 337 338 339 340 341 342 343 344 345 346 347


	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
348
void gdk_pixbuf__bmp_image_stop_load(gpointer data)
349 350 351 352 353 354 355 356 357
{
	struct bmp_progressive_state *context =
	    (struct bmp_progressive_state *) data;


	g_return_if_fail(context != NULL);

	if (context->LineBuf != NULL)
		g_free(context->LineBuf);
358
	context->LineBuf = NULL;
359

360 361
	if (context->HeaderBuf != NULL)
		g_free(context->HeaderBuf);
362
	context->LineBuf = NULL;
363 364 365 366 367 368 369 370

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

	g_free(context);
}


371 372 373 374 375 376 377 378 379 380 381
/*
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)
382 383 384
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  (context->Header.height - context->Lines - 1));
385
	else
386 387 388
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  context->Lines);
389 390 391 392 393 394 395 396 397 398
	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++;
	}

}

399 400 401 402 403 404
static void OneLine24(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
405
	if (context->Header.Negative == 0)
406 407 408
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  (context->Header.height - context->Lines - 1));
409
	else
410 411 412
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  context->Lines);
413 414 415 416 417 418 419 420 421 422 423 424 425 426 427
	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;
428
	if (context->Header.Negative == 0)
429 430 431
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  (context->Header.height - context->Lines - 1));
432
	else
433 434 435
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  context->Lines);
436 437
	while (X < context->Header.width) {
		Pixels[X * 3 + 0] =
438
		    context->HeaderBuf[4 * context->LineBuf[X] + 56];
439
		Pixels[X * 3 + 1] =
440
		    context->HeaderBuf[4 * context->LineBuf[X] + 55];
441
		Pixels[X * 3 + 2] =
442
		    context->HeaderBuf[4 * context->LineBuf[X] + 54];
443 444 445 446
		X++;
	}
}

447 448 449 450 451 452 453
static void OneLine4(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
	if (context->Header.Negative == 0)
454 455 456
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  (context->Header.height - context->Lines - 1));
457
	else
458 459 460
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  context->Lines);
461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487

	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++;
		}
	}

}

488 489 490 491 492 493
static void OneLine1(struct bmp_progressive_state *context)
{
	gint X;
	guchar *Pixels;

	X = 0;
494
	if (context->Header.Negative == 0)
495 496 497
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  (context->Header.height - context->Lines - 1));
498
	else
499 500 501
		Pixels = (context->pixbuf->pixels +
			  context->pixbuf->rowstride *
			  context->Lines);
502
	while (X < context->Header.width) {
503
		gint Bit;
504 505

		Bit = (context->LineBuf[X / 8]) >> (7 - (X & 7));
506
		Bit = Bit & 1;
507 508 509
		Pixels[X * 3 + 0] = Bit * 255;
		Pixels[X * 3 + 1] = Bit * 255;
		Pixels[X * 3 + 2] = Bit * 255;
510 511 512 513 514 515 516
		X++;
	}
}


static void OneLine(struct bmp_progressive_state *context)
{
517 518 519 520
	context->LineDone = 0;
	if (context->Lines >= context->Header.height)
		return;

521 522
	if (context->Type == 32)
		OneLine32(context);
523 524 525 526
	if (context->Type == 24)
		OneLine24(context);
	if (context->Type == 8)
		OneLine8(context);
527 528
	if (context->Type == 4)
		OneLine4(context);
529 530 531 532 533 534 535 536 537 538
	if (context->Type == 1)
		OneLine1(context);

	context->Lines++;

	if (context->updated_func != NULL) {
		(*context->updated_func) (context->pixbuf,
					  0,
					  context->Lines,
					  context->Header.width,
539 540
					  context->Header.height,
					  context->user_data);
541 542 543 544

	}
}

545 546 547 548 549 550 551
/* 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 */
552
		if ((*buf)[0] != 0) {	/* run count */
553 554
			context->compr.phase = 1;
			context->compr.RunCount = (*buf)[0];
555

556 557 558 559 560 561 562 563 564 565 566 567 568 569
		} 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 +
570 571
				       context->LineDone, (*buf)[0],
				       BytesToCopy);
572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599

				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];
600 601 602
			if (context->compr.RunCount & 1)
				context->compr.phase = 7;

603 604 605 606 607 608 609
		}
		(*buf)++;
		(*size)--;

		break;
	case 3:
		while ((context->compr.RunCount > 0)
610
		       && (*size > 0)) {
611 612 613 614 615 616 617 618 619
			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 +
620 621
				       context->LineDone, *buf,
				       BytesToCopy);
622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652

				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;
653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685
		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;
686 687 688
	}
}

689 690 691 692 693 694 695
/*
 * context - from image_begin_load
 * buf - new image data
 * size - length of new image data
 *
 * append image data onto inrecrementally built output image
 */
696 697
gboolean gdk_pixbuf__bmp_image_load_increment(gpointer data, guchar * buf,
					      guint size)
698 699 700 701 702 703 704
{
	struct bmp_progressive_state *context =
	    (struct bmp_progressive_state *) data;

	gint BytesToCopy;

	while (size > 0) {
705
		g_assert(context->LineDone >= 0);
706 707 708 709 710 711 712
		if (context->HeaderDone < context->HeaderSize) {	/* We still 
									   have headerbytes to do */
			BytesToCopy =
			    context->HeaderSize - context->HeaderDone;
			if (BytesToCopy > size)
				BytesToCopy = size;

713
			memmove(context->HeaderBuf + context->HeaderDone,
714
				buf, BytesToCopy);
715 716 717 718 719

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

720
		} else if (context->Compressed) {
721 722
			/* Compression is done 1 byte at a time for now */
			DoCompressedByte(context, &buf, &size);
723

724
		} else {
725
			/* Uncompressed pixeldata */
726 727 728 729 730 731
			BytesToCopy =
			    context->LineWidth - context->LineDone;
			if (BytesToCopy > size)
				BytesToCopy = size;

			if (BytesToCopy > 0) {
732
				memmove(context->LineBuf +
733 734
					context->LineDone, buf,
					BytesToCopy);
735 736 737 738 739

				size -= BytesToCopy;
				buf += BytesToCopy;
				context->LineDone += BytesToCopy;
			}
740 741
			if ((context->LineDone >= context->LineWidth)
			    && (context->LineWidth > 0))
742 743 744 745 746
				OneLine(context);


		}

747 748 749
		if (context->HeaderDone >= 14 + 40)
			DecodeHeader(context->HeaderBuf,
				     context->HeaderBuf + 14, context);
Mark Crichton's avatar
Mark Crichton committed
750 751


752
	}
Mark Crichton's avatar
Mark Crichton committed
753

754
	return TRUE;
Mark Crichton's avatar
Mark Crichton committed
755
}