Fix issue 428 toimage buffer does no work

examples/Makefile

@@ -1,14 +1,17 @@
 CFLAGS= -I ../include 
 LDFLAGS=-L ../bin -lwkhtmltox -Wall -ansi -pedantic -ggdb
 
-EXES=pdf_c_api
+EXES=pdf_c_api image_c_api
 
 all: $(EXES)
 
 .PHONY: clean run all
 
-run: $(EXES)
-	LD_LIBRARY_PATH=../bin ./pdf_c_api
+run: pdf_c_api
+	LD_LIBRARY_PATH=../bin ./pdf_c_api 
+
+runimage: image_c_api
+	LD_LIBRARY_PATH=../bin ./image_c_api
 
 clean:
 	$(RM) $(EXES)

examples/image_c_api.c

@@ -0,0 +1,103 @@
+/* -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
+ * vi:set ts=4 sts=4 sw=4 noet :
+ *
+ * Copyright 2010, 2011 wkhtmltopdf authors
+ *
+ * This file is part of wkhtmltopdf.
+ *
+ * wkhtmltopdf is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wkhtmltopdf 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 Lesser General Public License
+ * along with wkhtmltopdf.  If not, see <http: *www.gnu.org/licenses/>.
+ */
+
+/* This is a simple example program showing how to use the wkhtmltopdf c bindings */
+#include <stdbool.h>
+#include <stdio.h>
+#include <wkhtmltox/image.h>
+
+/* Print out loading progress information */
+void progress_changed(wkhtmltoimage_converter * c, int p) {
+	printf("%3d%%\r",p);
+	fflush(stdout);
+}
+
+/* Print loading phase information */
+void phase_changed(wkhtmltoimage_converter * c) {
+	int phase = wkhtmltoimage_current_phase(c);
+	printf("%s\n", wkhtmltoimage_phase_description(c, phase));
+}
+
+/* Print a message to stderr when an error occures */
+void error(wkhtmltoimage_converter * c, const char * msg) {
+	fprintf(stderr, "Error: %s\n", msg);
+}
+
+/* Print a message to stderr when a warning is issued */
+void warning(wkhtmltoimage_converter * c, const char * msg) {
+	fprintf(stderr, "Warning: %s\n", msg);
+}
+
+/* Main method convert image */
+int main() {
+	wkhtmltoimage_global_settings * gs;
+	wkhtmltoimage_converter * c;
+	const unsigned char * data;
+	long len;
+
+	/* Init wkhtmltoimage in graphics less mode */
+	wkhtmltoimage_init(false);
+
+	/*
+	 * Create a global settings object used to store options that are not
+	 * related to input objects, note that control of this object is parsed to
+	 * the converter later, which is then responsible for freeing it
+	 */
+	gs = wkhtmltoimage_create_global_settings();
+
+	/* We want to convert to convert the qstring documentation page */
+	wkhtmltoimage_set_global_setting(gs, "in", "http://www.google.com/");
+	wkhtmltoimage_set_global_setting(gs, "fmt", "jpeg");
+
+	/* Create the actual converter object used to convert the pages */
+	c = wkhtmltoimage_create_converter(gs, NULL);
+
+	/* Call the progress_changed function when progress changes */
+	wkhtmltoimage_set_progress_changed_callback(c, progress_changed);
+
+	/* Call the phase _changed function when the phase changes */
+	wkhtmltoimage_set_phase_changed_callback(c, phase_changed);
+
+	/* Call the error function when an error occures */
+	wkhtmltoimage_set_error_callback(c, error);
+
+	/* Call the waring function when a warning is issued */
+	wkhtmltoimage_set_warning_callback(c, warning);
+
+	/* Perform the actual convertion */
+	if (!wkhtmltoimage_convert(c))
+		fprintf(stderr, "Convertion failed!");
+
+	/* Output possible http error code encountered */
+	printf("httpErrorCode: %d\n", wkhtmltoimage_http_error_code(c));
+
+	len = wkhtmltoimage_get_output(c, &data);
+	printf("%ld len\n", len);
+
+
+	/* Destroy the converter object since we are done with it */
+	wkhtmltoimage_destroy_converter(c);
+
+	/* We will no longer be needing wkhtmltoimage funcionality */
+	wkhtmltoimage_deinit();
+
+	return 0;
+}

src/lib/imageconverter.cc

@@ -1,7 +1,7 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
@@ -133,10 +133,10 @@ void ImageConverterPrivate::pagesLoaded(bool ok) {
 	}
 	loaderObject->page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
 	//Set the right height
-  if(settings.screenHeight > 0)
-    loaderObject->page.setViewportSize(QSize(highWidth, settings.screenHeight));
-  else
-    loaderObject->page.setViewportSize(QSize(highWidth, frame->contentsSize().height()));
+	if (settings.screenHeight > 0)
+		loaderObject->page.setViewportSize(QSize(highWidth, settings.screenHeight));
+	else
+		loaderObject->page.setViewportSize(QSize(highWidth, frame->contentsSize().height()));
 
 	QPainter painter;
 	QSvgGenerator generator;
@@ -149,10 +149,10 @@ void ImageConverterPrivate::pagesLoaded(bool ok) {
 	// output image
 	if (settings.out.isEmpty()) {
 		dev =  &buffer;
-	} if (settings.out != "-" ) {
+		qDebug() << "I am here";
+	} else if (settings.out != "-" ) {
 		file.setFileName(settings.out);
 		openOk = file.open(QIODevice::WriteOnly);
-		qDebug() << "HERE" << endl;
 	} else {
 		openOk = file.open(stdout, QIODevice::WriteOnly);
 	}
@@ -209,7 +209,7 @@ void ImageConverterPrivate::pagesLoaded(bool ok) {
 
 	if (settings.fmt != "svg") {
 		QByteArray fmt=settings.fmt.toLatin1();
-		if (!image.save(&file,fmt.data(), settings.quality)) {
+		if (!image.save(dev,fmt.data(), settings.quality)) {
 			emit out.error("Could not save image");
 			fail();
 		}