diff --git a/src/zm_image.cpp b/src/zm_image.cpp index 0e8aa79c6..37a4c1a76 100644 --- a/src/zm_image.cpp +++ b/src/zm_image.cpp @@ -1697,7 +1697,7 @@ const Coord Image::centreCoord( const char *text ) const } /* RGB32 compatible: complete */ -void Image::Annotate( const char *p_text, const Coord &coord, int size, const Rgb fg_colour, const Rgb bg_colour ) +void Image::Annotate( const char *p_text, const Coord &coord, const int size, const Rgb fg_colour, const Rgb bg_colour ) { strncpy( text, p_text, sizeof(text) ); diff --git a/src/zm_image.h b/src/zm_image.h index d007688c2..1b62aba9e 100644 --- a/src/zm_image.h +++ b/src/zm_image.h @@ -122,7 +122,7 @@ protected: } public: - enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 }; + enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 }; enum { LINE_HEIGHT=CHAR_HEIGHT+0 }; protected: @@ -226,7 +226,7 @@ public: void Delta( const Image &image, Image* targetimage) const; const Coord centreCoord( const char *text ) const; - void Annotate( const char *p_text, const Coord &coord, int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK ); + void Annotate( const char *p_text, const Coord &coord, const int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK ); Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 ); //Image *HighlightEdges( Rgb colour, const Polygon &polygon ); void Timestamp( const char *label, const time_t when, const Coord &coord, const int size ); diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index 89fba5f2e..84da0f622 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -676,7 +676,6 @@ $SLANG = array( 'TimestampLabelFormat' => '時間標示格式', 'TimestampLabelX' => '時間標示 X', 'TimestampLabelY' => '時間標示 Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => 'Tools', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php index 7cadb6121..21bd2f269 100644 --- a/web/lang/cn_zh.php +++ b/web/lang/cn_zh.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => '时间戳标签格式', 'TimestampLabelX' => '时间戳标签 X', 'TimestampLabelY' => '时间戳标签 Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => '今天', 'Tools' => '工具', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 38b95fad2..ff0f6f260 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Formt asovho raztka', 'TimestampLabelX' => 'asov raztko X', 'TimestampLabelY' => 'asov raztko Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Dnes', 'Tools' => 'Nstroje', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index 9c2b79cd1..08795edf4 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -673,7 +673,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Tidsstempel Mrknings Format', 'TimestampLabelX' => 'Tidsstempel Mrkning X', 'TimestampLabelY' => 'Tidsstempel Mrkning Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Idag', 'Tools' => 'Tools', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index c66299641..1445437f6 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -623,7 +623,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Formato Etiqueta Hora', 'TimestampLabelX' => 'Eje X Etiqueta Hora', 'TimestampLabelY' => 'Eje Y Etiqueta Hora', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => 'Herra.', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php index 3346d930a..21274663d 100644 --- a/web/lang/et_ee.php +++ b/web/lang/et_ee.php @@ -673,7 +673,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Timestamp Label Format', 'TimestampLabelX' => 'Timestamp Label X', 'TimestampLabelY' => 'Timestamp Label Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Täna', 'Tools' => 'Tööriistad', 'Total' => 'Summa', // Added - 2011-06-16 diff --git a/web/lang/he_il.php b/web/lang/he_il.php index 81c397394..b7e89858c 100644 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Timestamp Label Format', 'TimestampLabelX' => 'Timestamp Label X', 'TimestampLabelY' => 'Timestamp Label Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => '', 'Tools' => '', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 89bf8c4a5..6c97fa150 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -715,7 +715,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Időbélyeg formátuma', 'TimestampLabelX' => 'Elhelyezés X pozició', 'TimestampLabelY' => 'Elhelyezés Y pozició', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Ma', 'Tools' => 'Eszközök', 'Total' => 'Összes', diff --git a/web/lang/it_it.php b/web/lang/it_it.php index f92bcfc9b..b367da15a 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -677,7 +677,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Formato etichetta timestamp', 'TimestampLabelX' => 'coordinata X etichetta', 'TimestampLabelY' => 'coordinata Y etichetta', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Oggi ', 'Tools' => 'Strumenti', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index 91f2ed829..9f0134f0a 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'ѽ ̫ϯ', 'TimestampLabelX' => 'ѽ X', 'TimestampLabelY' => 'ѽ Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => '°', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index 4be5832ed..298521b6a 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Tijdstempel Label Format', 'TimestampLabelX' => 'Tijdstempel Label X', 'TimestampLabelY' => 'Tijdstempel Label Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Vandaag', 'Tools' => 'Gereedschappen', 'Total' => 'Totaal', // Added - 2011-06-16 diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index e2172a9fc..71c4bbac6 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Format etykiety czasu', 'TimestampLabelX' => 'Wsp. X etykiety czasu', 'TimestampLabelY' => 'Wsp. Y etykiety czasu', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => 'Narzdzia', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index 0777ff59a..d079db359 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -612,7 +612,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Formato de etiqueta de tempo', 'TimestampLabelX' => 'posio de etiqueta X', 'TimestampLabelY' => 'posio de etiqueta Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => 'Ferramentas', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index 473ef3cf8..1b1bcb6dc 100644 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -643,7 +643,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Format eticheta format timp', 'TimestampLabelX' => 'Format timp eticheta X', 'TimestampLabelY' => 'Format timp eticheta Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Azi', 'Tools' => 'Unelte', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index 37ee0686b..7c98e4f48 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -672,7 +672,6 @@ $SLANG = array( 'TimestampLabelFormat' => ' ', 'TimestampLabelX' => 'X- ', 'TimestampLabelY' => 'Y- ', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Today', 'Tools' => '', 'Total' => 'Total', // Added - 2011-06-16 diff --git a/web/lang/se_se.php b/web/lang/se_se.php index fc63a0e21..ca4f05254 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -673,7 +673,6 @@ $SLANG = array( 'TimestampLabelFormat' => 'Format p tidsstmpel', 'TimestampLabelX' => 'Vrde p tidsstmpel X', 'TimestampLabelY' => 'Vrde p tidsstmpel Y', - 'TimestampLabelSize' => 'Font Size', 'Today' => 'Idag', 'Tools' => 'Verktyg', 'Total' => 'Total', // Added - 2011-06-16