imagetest: Save BMP file using BitmapCoder

This allows to test BitmapCoder::from_bitmap.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Uri Lublin <uril@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-08-22 12:58:25 +01:00
parent 9c85f8d3ca
commit 16aee83802
3 changed files with 8 additions and 16 deletions

View File

@ -23,8 +23,6 @@
#include "image.h"
#include "imagepng.h"
ImageCoder *create_bitmap_coder();
static ImageCoder *get_coder(uint32_t vdagent_type)
{
switch (vdagent_type) {

View File

@ -39,6 +39,8 @@ static inline size_t compute_dib_stride(unsigned int width, unsigned int bit_cou
return ((width * bit_count + 31u) & ~31u) / 8u;
}
ImageCoder *create_bitmap_coder();
/**
* Returns image to put in the clipboard.
*

View File

@ -18,6 +18,7 @@
#undef NDEBUG
#include <assert.h>
#include <vector>
#include <memory>
#include "vdcommon.h"
#include "image.h"
@ -42,7 +43,7 @@ save_dib_to_file(ImageCoder& coder, const uint8_t *raw_dib, const char *filename
int main(int argc, char **argv)
{
ImageCoder *coder = create_png_coder();
std::unique_ptr<ImageCoder> coder(create_png_coder());
assert(coder);
if (argc < 2) {
@ -68,19 +69,10 @@ int main(int argc, char **argv)
memset(&out[0], 0xcc, dib_size);
coder->get_dib_data(&out[0], &data[0], len);
// looks like many tools wants this header so craft it
BITMAPFILEHEADER head;
memset(&head, 0, sizeof(head));
head.bfType = 'B'+'M'*256u;
head.bfSize = sizeof(head) + dib_size;
BITMAPINFOHEADER& info(*(BITMAPINFOHEADER*)&out[0]);
head.bfOffBits = sizeof(head) + sizeof(BITMAPINFOHEADER) + 4 * info.biClrUsed;
f = fopen(argc > 2 ? argv[2] : "out.bmp", "wb");
assert(f);
assert(fwrite(&head, 1, sizeof(head), f) == sizeof(head));
assert(fwrite(&out[0], 1, dib_size, f) == dib_size);
fclose(f);
// write BMP file
std::unique_ptr<ImageCoder> bmp_coder(create_bitmap_coder());
assert(bmp_coder);
save_dib_to_file(*bmp_coder, &out[0], argc > 2 ? argv[2] : "out.bmp");
// convert back to PNG
save_dib_to_file(*coder, &out[0], argc > 3 ? argv[3] : "out.png");