mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-27 21:44:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

CMakeLists.txt: check against c not c++ (CheckCXX -> CheckC etc)

Browse source 
BMP/EMF/PCX/TIF: use more portable packed attribute instead of
  pragma if not MSVC
CHANNEL: pass ptr not struct to `channel_copy_precalc()`
This commit is contained in:
gitlost 2024-05-27 20:55:04 +01:00
parent 3960dfdbfc
commit 0a00d04ccc
8 changed files with 94 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/bmp.h
View file

@ -1,7 +1,7 @@
/* bmp.h - header structure for Windows bitmap files */
/*
libzint - the open source barcode library
Copyright (C) 2009-2022 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -37,14 +37,16 @@
extern "C" {
#endif
#pragma pack (1)
#ifdef _MSC_VER
#pragma pack(1)
#endif
typedef struct bitmap_file_header {
uint16_t header_field;
uint32_t file_size;
uint32_t reserved;
uint32_t data_offset;
} bitmap_file_header_t;
} OUT_PACK bitmap_file_header_t;
typedef struct bitmap_info_header {
uint32_t header_size;
@ -58,16 +60,18 @@ extern "C" {
int32_t vert_res;
uint32_t colours;
uint32_t important_colours;
} bitmap_info_header_t;
} OUT_PACK bitmap_info_header_t;
typedef struct color_ref {
uint8_t blue;
uint8_t green;
uint8_t red;
uint8_t reserved;
} color_ref_t;
} OUT_PACK color_ref_t;
#pragma pack ()
#ifdef _MSC_VER
#pragma pack()
#endif
#ifdef __cplusplus
}