Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fnc3 and win versioning #11

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix fnc3 and win versioning #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb8b300
fix for codes with starting FNC3 that returns invalid characters in s…
gpongelli Mar 29, 2023
6fac437
bump to version 1.1 and versioning windows DLL as it is on linux
gpongelli Mar 29, 2023
01e96ac
fix: warning comparison integer signedness
gpongelli Mar 29, 2023
306813a
implicit fallthrough warning
gpongelli Mar 30, 2023
1c2b58c
type-limits warning
gpongelli Mar 30, 2023
8dcbd26
fix for FNC3 starting character both on ARM and x86
gpongelli Mar 30, 2023
e985b81
revert a change that breaks some labels on windows
gpongelli Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
CFLAGS ?= -O2 -Wall -Wextra -Wno-implicit-fallthrough

MAJOR := 1
MINOR := 0
MINOR := 1
NAME := code128
VERSION := $(MAJOR).$(MINOR)

Expand Down
7 changes: 5 additions & 2 deletions Makefile_windows
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# This Makefile will build a DLL and an application which makes use of the DLL.

MAJOR := 1
MINOR := 1
VERSION := $(MAJOR).$(MINOR)
DLL_NAME := code128
EXE_NAME := code128png

Expand All @@ -23,7 +26,7 @@ EXE_LDFLAGS += $(foreach library,$(CODE128PNG_LIBRARIES),-l$(library))

# Names of tools to use when building
CC = cc
DLL = lib$(DLL_NAME)-$(ARCH).dll
DLL = lib$(DLL_NAME)_v$(VERSION)-$(ARCH).dll
EXE = $(EXE_NAME)-$(ARCH).exe

# Compiler flags
Expand Down Expand Up @@ -57,7 +60,7 @@ $(DLL_NAME).o: $(DLL_NAME).c $(DLL_NAME).h
${DLL}: ${DLL_OBJS}
${CC} -o "$@" ${DLL_OBJS} ${DLL_LDFLAGS}

# Buld the executable
# Build the executable
${EXE}: ${EXE_OBJS}
${CC} ${EXE_CFLAGS} -o "$@" ${EXE_OBJS} ${EXE_LDFLAGS}

Expand Down
24 changes: 17 additions & 7 deletions code128.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ static signed char code128_switch_code(char from_mode, char to_mode)
case CODE128_MODE_C:
return 99;
}
break;

case CODE128_MODE_B:
switch (to_mode) {
Expand All @@ -223,6 +224,7 @@ static signed char code128_switch_code(char from_mode, char to_mode)
case CODE128_MODE_C:
return 99;
}
break;

case CODE128_MODE_C:
switch (to_mode) {
Expand All @@ -231,6 +233,7 @@ static signed char code128_switch_code(char from_mode, char to_mode)
case CODE128_MODE_A:
return 101;
}
break;
}

assert(0); // Invalid mode switch
Expand All @@ -257,7 +260,8 @@ static signed char code128a_ascii_to_code(char value)

static signed char code128b_ascii_to_code(char value)
{
if (value >= 32) // value <= 127 is implied
/* value <= 127 is required to work both on x86 and on ARM. */
if ((value >= 32) && (value <= 127))
return value - 32;
else if (value == CODE128_FNC1)
return 102;
Expand Down Expand Up @@ -296,8 +300,9 @@ static int code128_do_a_step(struct code128_step *base, int prev_ix, int ix)
return 0;

step->code = code128a_ascii_to_code(value);
if (step->code < 0)
if (step->code < 0) {
return 0;
}

step->prev_ix = prev_ix;
step->next_input = previous_step->next_input + 1;
Expand All @@ -320,8 +325,9 @@ static int code128_do_b_step(struct code128_step *base, int prev_ix, int ix)
return 0;

step->code = code128b_ascii_to_code(value);
if (step->code < 0)
if (step->code < 0) {
return 0;
}

step->prev_ix = prev_ix;
step->next_input = previous_step->next_input + 1;
Expand All @@ -344,8 +350,9 @@ static int code128_do_c_step(struct code128_step *base, int prev_ix, int ix)
return 0;

step->code = code128c_ascii_to_code(previous_step->next_input);
if (step->code < 0)
if (step->code < 0) {
return 0;
}

step->prev_ix = prev_ix;
step->next_input = previous_step->next_input + 1;
Expand Down Expand Up @@ -380,8 +387,10 @@ static void code128_do_step(struct code128_state *state)
struct code128_step *step = &state->steps[state->current_ix];
if (*step->next_input == 0) {
// Done, so see if we have a new shortest encoding.
if ((step->len < state->maxlength) ||
(state->best_ix < 0 && step->len == state->maxlength)) {
// Fix for some FNC3 starting codes
size_t step_len = step->len - CODE128_CHAR_LEN;
if ((step_len < state->maxlength) ||
(state->best_ix < 0 && step_len == state->maxlength)) {
state->best_ix = state->current_ix;

// Update maxlength to avoid considering anything longer
Expand Down Expand Up @@ -483,7 +492,8 @@ size_t ADDCALL code128_encode_raw(const char *s, char *out, size_t maxlength)
} while (state.current_ix != state.todo_ix);

// If no best_step, then fail.
if (state.best_ix < 0) {
if (state.best_ix < 0)
{
free(state.steps);
return 0;
}
Expand Down