projects
/
platform
/
upstream
/
harfbuzz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.9.12
[platform/upstream/harfbuzz.git]
/
util
/
helper-cairo.cc
diff --git
a/util/helper-cairo.cc
b/util/helper-cairo.cc
index
35340d1
..
bc44e8e
100644
(file)
--- a/
util/helper-cairo.cc
+++ b/
util/helper-cairo.cc
@@
-246,6
+246,25
@@
stdio_write_func (void *closure,
return CAIRO_STATUS_SUCCESS;
}
return CAIRO_STATUS_SUCCESS;
}
+const char helper_cairo_supported_formats[] =
+ "ansi"
+ #ifdef CAIRO_HAS_PNG_FUNCTIONS
+ "/png"
+ #endif
+ #ifdef CAIRO_HAS_SVG_SURFACE
+ "/svg"
+ #endif
+ #ifdef CAIRO_HAS_PDF_SURFACE
+ "/pdf"
+ #endif
+ #ifdef CAIRO_HAS_PS_SURFACE
+ "/ps"
+ #ifdef HAS_EPS
+ "/eps"
+ #endif
+ #endif
+;
+
cairo_t *
helper_cairo_create_context (double w, double h,
view_options_t *view_opts,
cairo_t *
helper_cairo_create_context (double w, double h,
view_options_t *view_opts,
@@
-268,7
+287,13
@@
helper_cairo_create_context (double w, double h,
extension = "ansi";
else
#endif
extension = "ansi";
else
#endif
+ {
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
extension = "png";
extension = "png";
+#else
+ extension = "ansi";
+#endif
+ }
}
if (0)
;
}
if (0)
;
@@
-317,7
+342,10
@@
helper_cairo_create_context (double w, double h,
else if (constructor2)
surface = constructor2 (stdio_write_func, f, w, h, content);
else
else if (constructor2)
surface = constructor2 (stdio_write_func, f, w, h, content);
else
- fail (false, "Unknown output format `%s'", extension);
+ fail (false, "Unknown output format `%s'; supported formats are: %s%s",
+ extension, helper_cairo_supported_formats,
+ out_opts->explicit_output_format ? "" :
+ "\nTry setting format using --output-format");
cairo_t *cr = cairo_create (surface);
content = cairo_surface_get_content (surface);
cairo_t *cr = cairo_create (surface);
content = cairo_surface_get_content (surface);