Nathan Beckmann : gdiplus: Implement BMP encoding.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 75841d83233b1b84f353e2b0870bb9056e4a39a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75841d83233b1b84f353e2b087...

Author: Nathan Beckmann 
Date:   Mon Mar 10 08:16:56 2008 -0700

gdiplus: Implement BMP encoding.

Implement the encoding function for GDI+ images so that
GdipSaveImageToStream can encode images as BMP files.

---

dlls/gdiplus/image.c       |   46 +++++++++++++++++++++++++++++++++++++++++++-
 dlls/gdiplus/tests/image.c |    6 +---
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index ed23b0a..8307938 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -838,10 +838,54 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam
  * Encoding functions -
  *   These functions encode an image in different image file formats.
  */
+#define BITMAP_FORMAT_BMP   0x4d42 /* "BM" */
+#define BITMAP_FORMAT_JPEG  0xd8ff
+#define BITMAP_FORMAT_GIF   0x4947
+#define BITMAP_FORMAT_PNG   0x5089
+#define BITMAP_FORMAT_APM   0xcdd7
+
 static GpStatus encode_image_BMP(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info,
                                  void **output, unsigned int *output_size)
 {
-    return NotImplemented;
+    int num_palette_entries;
+    BITMAPFILEHEADER *bmp_file_hdr;
+    BITMAPINFO *bmp_info_hdr;
+
+    if (bitmap_info->bmiHeader.biClrUsed) {
+        num_palette_entries = bitmap_info->bmiHeader.biClrUsed;
+        if (num_palette_entries > 256) num_palette_entries = 256;
+    } else {
+        if (bitmap_info->bmiHeader.biBitCount <= 8)
+            num_palette_entries = 1 << bitmap_info->bmiHeader.biBitCount;
+        else
+            num_palette_entries = 0;
+    }
+
+    *output_size =
+        sizeof(BITMAPFILEHEADER) +
+        sizeof(BITMAPINFOHEADER) +
+        num_palette_entries * sizeof(RGBQUAD) +
+        bitmap_info->bmiHeader.biSizeImage;
+
+    *output = GdipAlloc(*output_size);
+
+    bmp_file_hdr = (BITMAPFILEHEADER*) *output;
+    bmp_file_hdr->bfType = BITMAP_FORMAT_BMP;
+    bmp_file_hdr->bfSize = *output_size;
+    bmp_file_hdr->bfOffBits =
+        sizeof(BITMAPFILEHEADER) +
+        sizeof(BITMAPINFOHEADER) +
+        num_palette_entries * sizeof (RGBQUAD);
+
+    bmp_info_hdr = (BITMAPINFO*) ((unsigned char*)(*output) + sizeof(BITMAPFILEHEADER));
+    memcpy(bmp_info_hdr, bitmap_info, sizeof(BITMAPINFOHEADER) + num_palette_entries * sizeof(RGBQUAD));
+    memcpy((unsigned char *)(*output) +
+           sizeof(BITMAPFILEHEADER) +
+           sizeof(BITMAPINFOHEADER) +
+           num_palette_entries * sizeof(RGBQUAD),
+           bitmap_bits, bitmap_info->bmiHeader.biSizeImage);
+
+    return Ok;
 }

typedef GpStatus encode_image_func(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info,
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 05b21b3..489b1a8 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -159,10 +159,8 @@ static void test_SavingImages(void)
     stat = GdipGetImageEncoders(n, s, codecs);
     if (stat != Ok) goto cleanup;

-    todo_wine {
-        stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0);
-        expect(stat, Ok);
-    }
+    stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0);
+    expect(stat, Ok);

cleanup:
     if (codecs)