From e32561cb349470c966733ed11cc7f16cdbf33049 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Thu, 17 Jun 2010 21:34:58 +0100 Subject: [PATCH] Removal of some ghosts Removal of some more old Codablock-F code and some depreciated functions from the API. --- backend/library.c | 10 ---------- backend/png.c | 28 +++++++--------------------- backend/ps.c | 15 --------------- backend/svg.c | 11 ----------- backend/zint.h | 4 ---- 5 files changed, 7 insertions(+), 61 deletions(-) diff --git a/backend/library.c b/backend/library.c index 41d81153..c3276db0 100644 --- a/backend/library.c +++ b/backend/library.c @@ -741,11 +741,6 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle) return error_number; } -int ZBarcode_Print_Rotated(struct zint_symbol *symbol, int rotate_angle) { - /* Depreciated - will be removed in later version */ - return ZBarcode_Print(symbol, rotate_angle); -} - int ZBarcode_Encode_and_Print(struct zint_symbol *symbol, unsigned char *input, int length, int rotate_angle) { int error_number; @@ -776,11 +771,6 @@ int ZBarcode_Encode_and_Buffer(struct zint_symbol *symbol, unsigned char *input, return error_number; } -int ZBarcode_Encode_and_Print_Rotated(struct zint_symbol *symbol, unsigned char *input, int rotate_angle) { - /* Depreciated - will be removed in later version */ - return ZBarcode_Encode_and_Print(symbol, input, rotate_angle, strlen((char *)input)); -} - int ZBarcode_Encode_File(struct zint_symbol *symbol, char *filename) { FILE *file; diff --git a/backend/png.c b/backend/png.c index f93f17c1..8b750d7d 100644 --- a/backend/png.c +++ b/backend/png.c @@ -1066,27 +1066,13 @@ int png_plot(struct zint_symbol *symbol, int rotate_angle, int data_type) /* Put boundary bars or box around symbol */ if(((symbol->output_options & BARCODE_BOX) != 0) || ((symbol->output_options & BARCODE_BIND) != 0)) { - if((symbol->symbology != BARCODE_CODABLOCKF) && (symbol->symbology != BARCODE_HIBC_BLOCKF)) { - /* boundary bars */ - draw_bar(pixelbuf, 0, (symbol->width + xoffset + xoffset) * 2, textoffset * 2, symbol->border_width * 2, image_width, image_height); - draw_bar(pixelbuf, 0, (symbol->width + xoffset + xoffset) * 2, (textoffset + symbol->height + symbol->border_width) * 2, symbol->border_width * 2, image_width, image_height); - if((symbol->output_options & BARCODE_BIND) != 0) { - if((symbol->rows > 1) && (is_stackable(symbol->symbology) == 1)) { - /* row binding */ - for(r = 1; r < symbol->rows; r++) { - draw_bar(pixelbuf, xoffset * 2, symbol->width * 2, ((r * row_height) + textoffset + yoffset - 1) * 2, 2 * 2, image_width, image_height); - } - } - } - } else { - /* boundary bars */ - draw_bar(pixelbuf, xoffset * 2, symbol->width * 2, textoffset * 2, symbol->border_width * 2, image_width, image_height); - draw_bar(pixelbuf, xoffset * 2, symbol->width * 2, (textoffset + symbol->height + symbol->border_width) * 2, symbol->border_width * 2, image_width, image_height); - if(symbol->rows > 1) { - /* row binding */ - for(r = 1; r < symbol->rows; r++) { - draw_bar(pixelbuf, (xoffset + 11) * 2, (symbol->width - 24) * 2, ((r * row_height) + textoffset + yoffset - 1) * 2, 2 * 2, image_width, image_height); - } + /* boundary bars */ + draw_bar(pixelbuf, xoffset * 2, symbol->width * 2, textoffset * 2, symbol->border_width * 2, image_width, image_height); + draw_bar(pixelbuf, xoffset * 2, symbol->width * 2, (textoffset + symbol->height + symbol->border_width) * 2, symbol->border_width * 2, image_width, image_height); + if(symbol->rows > 1) { + /* row binding */ + for(r = 1; r < symbol->rows; r++) { + draw_bar(pixelbuf, (xoffset + 11) * 2, (symbol->width - 24) * 2, ((r * row_height) + textoffset + yoffset - 1) * 2, 2 * 2, image_width, image_height); } } } diff --git a/backend/ps.c b/backend/ps.c index dc7ce9c2..c7d6d93a 100644 --- a/backend/ps.c +++ b/backend/ps.c @@ -706,21 +706,6 @@ int ps_plot(struct zint_symbol *symbol) xoffset -= comp_offset; switch(symbol->symbology) { - case BARCODE_CODABLOCKF: - case BARCODE_HIBC_BLOCKF: - fprintf(feps, "TE\n"); - fprintf(feps, "%.2f %.2f %.2f setrgbcolor\n", red_ink, green_ink, blue_ink); - fprintf(feps, "%.2f %.2f TB %.2f %.2f TR\n", symbol->border_width * scaler, textoffset * scaler, xoffset * scaler, symbol->width * scaler); - fprintf(feps, "%.2f %.2f TB %.2f %.2f TR\n", symbol->border_width * scaler, (textoffset + symbol->height + symbol->border_width) * scaler, xoffset * scaler, symbol->width * scaler); - if(symbol->rows > 1) { - /* row binding */ - fprintf(feps, "TE\n"); - fprintf(feps, "%.2f %.2f %.2f setrgbcolor\n", red_ink, green_ink, blue_ink); - for(r = 1; r < symbol->rows; r++) { - fprintf(feps, "%.2f %.2f TB %.2f %.2f TR\n", 2.0 * scaler, ((r * row_height) + textoffset + yoffset - 1) * scaler, (xoffset + 11) * scaler, (symbol->width - 24) * scaler); - } - } - break; case BARCODE_MAXICODE: /* Do nothing! (It's already been done) */ break; diff --git a/backend/svg.c b/backend/svg.c index 68fb871d..ef4ad1b2 100644 --- a/backend/svg.c +++ b/backend/svg.c @@ -569,17 +569,6 @@ int svg_plot(struct zint_symbol *symbol) xoffset -= comp_offset; switch(symbol->symbology) { - case BARCODE_CODABLOCKF: - case BARCODE_HIBC_BLOCKF: - fprintf(fsvg, " \n", xoffset * scaler, 0.0, symbol->width * scaler, symbol->border_width * scaler); - fprintf(fsvg, " \n", xoffset * scaler, (symbol->height + symbol->border_width) * scaler, symbol->width * scaler, symbol->border_width * scaler); - if(symbol->rows > 1) { - /* row binding */ - for(r = 1; r < symbol->rows; r++) { - fprintf(fsvg, " \n", (xoffset + 11) * scaler, ((r * row_height) + yoffset - 1) * scaler, (symbol->width - 24) * scaler, 2.0 * scaler); - } - } - break; case BARCODE_MAXICODE: /* Do nothing! (It's already been done) */ break; diff --git a/backend/zint.h b/backend/zint.h index 80b8970e..d6242de1 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -217,10 +217,6 @@ ZINT_EXTERN int ZBarcode_Encode_File_and_Buffer(struct zint_symbol *symbol, char ZINT_EXTERN int ZBarcode_ValidID(int symbol_id); -/* Depreciated */ -ZINT_EXTERN int ZBarcode_Print_Rotated(struct zint_symbol *symbol, int rotate_angle); -ZINT_EXTERN int ZBarcode_Encode_and_Print_Rotated(struct zint_symbol *symbol, unsigned char *input, int rotate_angle); - #ifdef __cplusplus } #endif /* __cplusplus */