diff options
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/svg-affine.cpp | 4 | ||||
| -rw-r--r-- | src/svg/svg-color.cpp | 10 | ||||
| -rw-r--r-- | src/svg/svg-length.cpp | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index 76d89579d..e357a2471 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -33,7 +33,7 @@ sp_svg_transform_read(gchar const *str, Geom::Affine *transform) int n_args; size_t key_len; - if (str == NULL) return false; + if (str == nullptr) return false; Geom::Affine a(Geom::identity()); @@ -173,7 +173,7 @@ sp_svg_transform_write(Geom::Affine const &transform) if (transform.isIdentity()) { // We are more or less identity, so no transform attribute needed: - return NULL; + return nullptr; } else if (transform.isScale()) { // We are more or less a uniform scale strcpy (c + p, "scale("); diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 1f26d02b1..5d8a5c448 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -210,7 +210,7 @@ static std::map<string, unsigned long> sp_svg_create_color_hash(); guint32 sp_svg_read_color(gchar const *str, guint32 const dfl) { - return sp_svg_read_color(str, NULL, dfl); + return sp_svg_read_color(str, nullptr, dfl); } static guint32 internal_sp_svg_read_color(gchar const *str, gchar const **end_ptr, guint32 def) @@ -218,7 +218,7 @@ static guint32 internal_sp_svg_read_color(gchar const *str, gchar const **end_pt static std::map<string, unsigned long> colors; guint32 val = 0; - if (str == NULL) return def; + if (str == nullptr) return def; while ((*str <= ' ') && *str) str++; if (!*str) return def; @@ -437,7 +437,7 @@ static void rgb24_to_css(char *const buf, unsigned const rgb24) * restricted set because the only component values are {00,80,ff}, other than silver 0xc0c0c0. */ - char const *src = NULL; + char const *src = nullptr; switch (rgb24) { /* Extracted mechanically from the table at * http://www.w3.org/TR/REC-html40/types.html#h-6.5 .*/ @@ -598,7 +598,7 @@ bool sp_svg_read_icc_color( gchar const *str, gchar const **end_ptr, SVGICCColor if ( good ) { while ( *str && *str != ')' ) { if ( g_ascii_isdigit(*str) || *str == '.' || *str == '-' || *str == '+') { - gchar* endPtr = 0; + gchar* endPtr = nullptr; gdouble dbl = g_ascii_strtod( str, &endPtr ); if ( !errno ) { if ( dest ) { @@ -645,7 +645,7 @@ bool sp_svg_read_icc_color( gchar const *str, gchar const **end_ptr, SVGICCColor bool sp_svg_read_icc_color( gchar const *str, SVGICCColor* dest ) { - return sp_svg_read_icc_color(str, NULL, dest); + return sp_svg_read_icc_color(str, nullptr, dest); } diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp index b3468d49c..a4cf82983 100644 --- a/src/svg/svg-length.cpp +++ b/src/svg/svg-length.cpp @@ -187,7 +187,7 @@ bool SVGLength::read(gchar const *str) SVGLength::Unit u; float v; float c; - if (!sp_svg_length_read_lff(str, &u, &v, &c, NULL)) { + if (!sp_svg_length_read_lff(str, &u, &v, &c, nullptr)) { return false; } @@ -213,7 +213,7 @@ bool SVGLength::readAbsolute(gchar const *str) SVGLength::Unit u; float v; float c; - if (!sp_svg_length_read_lff(str, &u, &v, &c, NULL)) { + if (!sp_svg_length_read_lff(str, &u, &v, &c, nullptr)) { return false; } @@ -238,7 +238,7 @@ unsigned int sp_svg_length_read_computed_absolute(gchar const *str, float *lengt SVGLength::Unit unit; float computed; - if (!sp_svg_length_read_lff(str, &unit, NULL, &computed, NULL)) { + if (!sp_svg_length_read_lff(str, &unit, nullptr, &computed, nullptr)) { // failed to read return 0; } @@ -316,7 +316,7 @@ So after the number, the string does not necessarily have a \0 or a unit, it mig *computed = v; } if (next) { - *next = NULL; // no more values + *next = nullptr; // no more values } return 1; } else if (!g_ascii_isalnum(e[0])) { @@ -443,7 +443,7 @@ unsigned int sp_svg_length_read_ldd(gchar const *str, SVGLength::Unit *unit, dou { float a; float b; - unsigned int r = sp_svg_length_read_lff(str, unit, &a, &b, NULL); + unsigned int r = sp_svg_length_read_lff(str, unit, &a, &b, nullptr); if (r) { if (value) { *value = a; @@ -529,7 +529,7 @@ void SVGLength::update(double em, double ex, double scale) double sp_svg_read_percentage(char const *str, double def) { - if (str == NULL) { + if (str == nullptr) { return def; } |
