Change byte to ubyte

This commit is contained in:
Tiago Conceição
2021-08-12 23:32:49 +01:00
parent 80a9adbcd0
commit 12ce4d75aa
8 changed files with 43 additions and 43 deletions
+3 -3
View File
@@ -52,7 +52,7 @@ struct PREVIEW {
uint Unknown3 <fgcolor=cBlack, bgcolor=cRed>;
uint Unknown4 <fgcolor=cBlack, bgcolor=cRed>;
byte Data[ImageLength] <fgcolor=cBlack, bgcolor=cRed>;
ubyte Data[ImageLength] <fgcolor=cBlack, bgcolor=cRed>;
};
struct PRINT_PARAMETERS {
@@ -149,7 +149,7 @@ if(header.Version >= 4)
uint Padding6 <fgcolor=cWhite, bgcolor=cBlue>;
uint Unknown5 <fgcolor=cWhite, bgcolor=cBlue>; // 23047 but changes
uint Unknown6 <fgcolor=cWhite, bgcolor=cBlue>; // 320 but changes
byte Reserved[420] <fgcolor=cWhite, bgcolor=cBlue>;
ubyte Reserved[420] <fgcolor=cWhite, bgcolor=cBlue>;
} printParametersV4;
}
@@ -183,7 +183,7 @@ typedef struct() {
typedef struct(int size) {
byte layerDataBlock[size] <fgcolor=cBlack, bgcolor=cGreen>;
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=cGreen>;
} LAYER_RLE;
FSeek(header.LayersDefinitionOffsetAddress);
+8 -8
View File
@@ -21,29 +21,29 @@ typedef struct() {
typedef struct() {
uint32 unknown <fgcolor=cBlack, bgcolor=cWhite>;
uint32 LayerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
uint32 LayerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
layerPointsData pD()[LayerPointNum];
ubyte CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
} layerData;
typedef struct(int size) {
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
} rgbPreviewImageRawData;
struct HEADER {
uint32 headerSize <fgcolor=cBlack, bgcolor=cWhite>;
ubyte header[header.headerSize] <fgcolor=cBlack, bgcolor=cRed>;
uint16 totalLayers <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionX <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionY <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionY <fgcolor=cBlack, bgcolor=cWhite>;
rgbPreviewImageRawData preview(116*116*2);
BYTE rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
BYTE rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
ubyte rn2[2] <fgcolor=cBlack, bgcolor=cRed>;
@@ -73,7 +73,7 @@ struct LAYER_DEF {
struct LAYER_DEF {
local int i;
for( i = 0; i < header.totalLayers; i++ ){
for( i = 0; i < header.totalLayers; i++ ){
layerDef lD();
}
ubyte rn3[2] <fgcolor=cBlack, bgcolor=cRed>;
@@ -85,7 +85,7 @@ struct LAYERS {
layerData lD();
}
} layers;
struct FOOTER {
uint32 footerSize <fgcolor=cBlack, bgcolor=cWhite>;
ubyte str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
+14 -14
View File
@@ -6,8 +6,8 @@
//------------------------------------------------
// CHANGELOG:
// Add uint16 unknown after header (Set to 2)
// Add uint32 modelSize and BYTE model[modelSize] after unknown
// Add byte offset[64] after resolutionY (Zeros)
// Add uint32 modelSize and ubyte model[modelSize] after unknown
// Add ubyte offset[64] after resolutionY (Zeros)
BigEndian();
@@ -26,36 +26,36 @@ typedef struct() {
typedef struct() {
uint32 layerArea <fgcolor=cBlack, bgcolor=cWhite>;
uint32 layerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
uint32 layerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
layerPointsData pD()[layerPointNum];
ubyte CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
} layerData;
typedef struct(int size) {
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
} rgbPreviewImageRawData;
struct HEADER {
uint32 headerSize <fgcolor=cBlack, bgcolor=cWhite>;
ubyte header[headerSize] <fgcolor=cBlack, bgcolor=cRed>;
uint16 version <fgcolor=cBlack, bgcolor=cWhite>;
uint16 version <fgcolor=cBlack, bgcolor=cWhite>;
uint32 modelSize <fgcolor=cBlack, bgcolor=cWhite>;
ubyte model[modelSize] <fgcolor=cBlack, bgcolor=cRed>;
uint16 totalLayers <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionX <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionX <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionY <fgcolor=cBlack, bgcolor=cWhite>;
byte offset[64];
ubyte offset[64];
rgbPreviewImageRawData preview(116*116*2);
BYTE rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
BYTE rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
ubyte rn2[2] <fgcolor=cBlack, bgcolor=cRed>;
@@ -85,7 +85,7 @@ struct LAYER_DEF {
struct LAYER_DEF {
local int i;
for( i = 0; i < header.totalLayers; i++ ){
for( i = 0; i < header.totalLayers; i++ ){
layerDef lD();
}
ubyte rn3[2] <fgcolor=cBlack, bgcolor=cRed>;
@@ -97,8 +97,8 @@ struct LAYERS {
layerData lD();
}
} layers;
struct FOOTER {
uint32 footerSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
uint32 footerSize <fgcolor=cBlack, bgcolor=cWhite>;
ubyte str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
+6 -6
View File
@@ -18,23 +18,23 @@ typedef struct() {
uint32 LayerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
layerPointsData pD()[LayerPointNum];
BYTE CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
typedef struct(int size) {
BYTE layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
} rgbPreviewImageRawData;
struct HEADER {
char version[2] <fgcolor=cBlack, bgcolor=cWhite>;
ushort headerSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE header[header.headerSize] <fgcolor=cBlack, bgcolor=cRed>;
ubyte header[header.headerSize] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview(116*116*2);
BYTE rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
BYTE rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
uint16 totalLayers <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionX <fgcolor=cBlack, bgcolor=cWhite>;
@@ -72,5 +72,5 @@ struct LAYERS {
struct FOOTER {
uint32 footerSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
ubyte str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
} footer;
+3 -3
View File
@@ -9,7 +9,7 @@ LittleEndian();
typedef struct() {
uint32 DataSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE LayerRLE[DataSize] <fgcolor=cBlack, bgcolor=cRed>;
ubyte LayerRLE[DataSize] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
@@ -62,13 +62,13 @@ struct HEADER {
} header;
byte preview_data[header.PreviewSizeX*header.PreviewSizeY*2];
ubyte preview_data[header.PreviewSizeX*header.PreviewSizeY*2];
if(header.PrinterModel == 120) // .lgs120
{
struct PNG_PREVIEW {
uint32 pngLength <fgcolor=cBlack, bgcolor=cRed>;
byte png[pngLength] <fgcolor=cBlack, bgcolor=cYellow>;
ubyte png[pngLength] <fgcolor=cBlack, bgcolor=cYellow>;
ushort padding <fgcolor=cBlack, bgcolor=cRed>;
} png_preview;
}
+6 -6
View File
@@ -18,23 +18,23 @@ typedef struct() {
uint32 LayerPointNum <fgcolor=cBlack, bgcolor=cWhite>;
layerPointsData pD()[LayerPointNum];
BYTE CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte CR_LF2[2] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
typedef struct(int size) {
BYTE layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
} rgbPreviewImageRawData;
struct HEADER {
char version[2] <fgcolor=cBlack, bgcolor=cWhite>;
ushort headerSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE header[header.headerSize] <fgcolor=cBlack, bgcolor=cRed>;
ubyte header[header.headerSize] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview(116*116*2);
BYTE rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn0[2] <fgcolor=cBlack, bgcolor=cRed>;
rgbPreviewImageRawData preview2(290*290*2);
BYTE rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
ubyte rn1[2] <fgcolor=cBlack, bgcolor=cRed>;
uint16 totalLayers <fgcolor=cBlack, bgcolor=cWhite>;
uint16 resolutionX <fgcolor=cBlack, bgcolor=cWhite>;
@@ -64,5 +64,5 @@ struct LAYERS {
struct FOOTER {
uint32 footerSize <fgcolor=cBlack, bgcolor=cWhite>;
BYTE str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
ubyte str[footer.footerSize] <fgcolor=cBlack, bgcolor=cRed>;
} footer;
+1 -1
View File
@@ -57,7 +57,7 @@ if(header.TableSize > headerSize)
struct CUSTOM {
uint TableSize <fgcolor=cBlack, bgcolor=cWhite>;
if(TableSize > 0){
byte Data[TableSize] <fgcolor=cBlack, bgcolor=cWhite>;
ubyte Data[TableSize] <fgcolor=cBlack, bgcolor=cWhite>;
}
} custom;
+2 -2
View File
@@ -15,11 +15,11 @@ typedef struct() {
uint32 ResolutionY <fgcolor=cBlack, bgcolor=cWhite>;
uint32 DataSize <fgcolor=cBlack, bgcolor=cWhite>;
uint32 Unknown4 <fgcolor=cBlack, bgcolor=cWhite>; // 2684702720
BYTE LayerRLE[DataSize / 8 - 4] <fgcolor=cBlack, bgcolor=cRed>;
ubyte LayerRLE[DataSize / 8 - 4] <fgcolor=cBlack, bgcolor=cRed>;
} layerData;
typedef struct(int size) {
BYTE layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
ubyte layerDataBlock[size] <fgcolor=cBlack, bgcolor=0x00FF00>;
} rgbPreviewImageRawData;
struct HEADER {