ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First (working) steps for adding large timestamp to images

This commit is contained in:
Robin Daermann 2015-08-06 14:41:33 +02:00
parent 485cf88120
commit c733fec476
3 changed files with 6160 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6153
src/zm_bigfont.h Normal file
View File

File diff suppressed because it is too large Load Diff

9
src/zm_image.cpp
View File

@ -17,7 +17,8 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
#include "zm.h" #include "zm.h"
#include "zm_font.h" //#include "zm_font.h"
#include "zm_bigfont.h"
#include "zm_image.h" #include "zm_image.h"
#include "zm_utils.h" #include "zm_utils.h"
#include "zm_rgb.h" #include "zm_rgb.h"
@ -1762,7 +1763,7 @@ void Image::Annotate( const char *p_text, const Coord &coord, const Rgb fg_colou
int f = fontdata[(line[c] * CHAR_HEIGHT) + r]; int f = fontdata[(line[c] * CHAR_HEIGHT) + r];
for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr++ ) for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr++ )
{ {
if ( f & (0x80 >> i) ) if ( f & (0x8000 >> i) )
{ {
if ( !fg_trans ) if ( !fg_trans )
*temp_ptr = fg_bw_col; *temp_ptr = fg_bw_col;
@ -1788,7 +1789,7 @@ void Image::Annotate( const char *p_text, const Coord &coord, const Rgb fg_colou
int f = fontdata[(line[c] * CHAR_HEIGHT) + r]; int f = fontdata[(line[c] * CHAR_HEIGHT) + r];
for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr += colours ) for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr += colours )
{ {
if ( f & (0x80 >> i) ) if ( f & (0x8000 >> i) )
{ {
if ( !fg_trans ) if ( !fg_trans )
{ {
@ -1820,7 +1821,7 @@ void Image::Annotate( const char *p_text, const Coord &coord, const Rgb fg_colou
int f = fontdata[(line[c] * CHAR_HEIGHT) + r]; int f = fontdata[(line[c] * CHAR_HEIGHT) + r];
for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr++ ) for ( unsigned int i = 0; i < CHAR_WIDTH && x < hi_line_x; i++, x++, temp_ptr++ )
{ {
if ( f & (0x80 >> i) ) if ( f & (0x8000 >> i) )
{ {
if ( !fg_trans ) if ( !fg_trans )
{ {

3
src/zm_image.h
View File

@ -122,7 +122,8 @@ protected:
} }
public: public:
enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 }; /* enum { CHAR_HEIGHT=11, CHAR_WIDTH=6 }; */
enum { CHAR_HEIGHT=22, CHAR_WIDTH=14 };
enum { LINE_HEIGHT=CHAR_HEIGHT+0 }; enum { LINE_HEIGHT=CHAR_HEIGHT+0 };
protected: protected: