Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- Makefile.am | 17 +++++++++++- vdagent/imagetest.cpp | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 vdagent/imagetest.cpp diff --git a/Makefile.am b/Makefile.am index 0f67cff..24df562 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ endif # -lversion is needed for the GetFileVersion* API which is used by vdlog.cpp LIBS = -lversion -bin_PROGRAMS = vdagent vdservice +bin_PROGRAMS = vdagent vdservice imagetest vdagent_LDADD = $(LIBPNG_LIBS) $(ZLIB_LIBS) -lwtsapi32 -lgdi32 vdagent_rc.$(OBJEXT) vdagent_CXXFLAGS = $(AM_CXXFLAGS) $(LIBPNG_CFLAGS) @@ -68,6 +68,21 @@ vdservice_rc.$(OBJEXT): vdservice/vdservice.rc MAINTAINERCLEANFILES += vdservice_rc.$(OBJEXT) +imagetest_LDADD = $(LIBPNG_LIBS) $(ZLIB_LIBS) -lwtsapi32 -lgdi32 +imagetest_CXXFLAGS = $(AM_CXXFLAGS) $(LIBPNG_CFLAGS) +imagetest_LDFLAGS = $(AM_LDFLAGS) -Wl,--subsystem,console +imagetest_SOURCES = \ + common/vdcommon.cpp \ + common/vdcommon.h \ + common/vdlog.cpp \ + common/vdlog.h \ + vdagent/imagetest.cpp \ + vdagent/image.cpp \ + vdagent/image.h \ + vdagent/imagepng.cpp \ + vdagent/imagepng.h \ + $(NULL) + deps.txt: $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ diff --git a/vdagent/imagetest.cpp b/vdagent/imagetest.cpp new file mode 100644 index 0000000..b0dd4e1 --- /dev/null +++ b/vdagent/imagetest.cpp @@ -0,0 +1,77 @@ +/* + Copyright (C) 2016 Red Hat, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#undef NDEBUG +#include "vdcommon.h" +#include "image.h" +#include "imagepng.h" +#include <assert.h> +#include <vector> + +int main(int argc, char **argv) +{ + ImageCoder *coder = create_png_coder(); + + assert(coder); + assert(argc >= 1); + + // read all file into memory + FILE *f = fopen(argv[1], "rb"); + assert(f); + assert(fseek(f, 0, SEEK_END) == 0); + long len = ftell(f); + assert(fseek(f, 0, SEEK_SET) == 0); + + std::vector<uint8_t> data(len); + assert(fread(&data[0], 1, len, f) == len); + fclose(f); + + size_t dib_size = coder->get_dib_size(&data[0], len); + assert(dib_size); + std::vector<uint8_t> out(dib_size); + 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("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); + + // convert back to PNG + long png_size = 0; + uint8_t *png = coder->from_bitmap(*((BITMAPINFO*)&out[0]), &out[sizeof(BITMAPINFOHEADER) + 4 * info.biClrUsed], png_size); + assert(png && png_size); + + f = fopen("out.png", "wb"); + assert(f); + assert(fwrite(png, 1, png_size, f) == png_size); + fclose(f); + free(png); + png = NULL; + + return 0; +} + -- 2.7.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel