瀏覽代碼

add missing convert function

Antialize 15 年之前
父節點
當前提交
9f8ed63fce
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 2 2
      include/wkhtmltox/image.h
  2. 2 2
      src/lib/image.h
  3. 4 4
      src/lib/image_c_bindings.cc

+ 2 - 2
include/wkhtmltox/image.h

@@ -49,8 +49,8 @@ CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter,
 CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
 CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
 CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
-CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter);
-/* CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); */
+CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); */
+/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
 /* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */
 
 CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);

+ 2 - 2
src/lib/image.h

@@ -51,8 +51,8 @@ CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter,
 CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb);
 CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
 CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb);
-CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter);
-/* CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); */
+CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); */
+/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */
 /* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */
 
 CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);

+ 4 - 4
src/lib/image_c_bindings.cc

@@ -125,17 +125,17 @@ CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converte
 	reinterpret_cast<MyImageConverter *>(converter)->finished_cb = cb;
 }
 
-CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter) {
+/*CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter) {
 	reinterpret_cast<MyImageConverter *>(converter)->converter.beginConvertion();
-}
+	}*/
 
 CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter) {
 	return reinterpret_cast<MyImageConverter *>(converter)->converter.convert();
 }
 
-CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter) {
+/*CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter) {
 	reinterpret_cast<MyImageConverter *>(converter)->converter.cancel();
-}
+	}*/
 
 CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter) {
 	return reinterpret_cast<MyImageConverter *>(converter)->converter.currentPhase();