LoadBMP

javiergutierrezchamorro · May 19, 2024 · 437a309 · 437a309
1 parent 26d8c11
commit 437a309
Show file tree

Hide file tree

Showing 26 changed files with 160 additions and 78 deletions.
diff --git a/Source/main.c b/Source/main.c
@@ -42,6 +42,10 @@ void main( int argc, char *argv[] )
 	VGA256_Video = VBE_GetVideoPtr(iMode);
 
 
+	//Todo: Crop
+	//Rotate 180 / FlipV
+	//FlipH
+
 	DemoDraw();
 	VGA256GetCh();
 

diff --git a/Source/test.c b/Source/test.c
@@ -5,82 +5,95 @@
 #include <math.h>
 #include <io.h>
 
-void VGA256ScaleImage(unsigned char* pDest, unsigned char* pSource, unsigned int widthd, unsigned int heightd, unsigned int widths, unsigned int heights);
+
 
 /*------------------------------------------------------------------------------------------------------- */
-void main(int argc, char* argv[])
+#pragma pack (push, 1)
+struct bmp_header
 {
-    unsigned char image[4][10] =
-    {
-        { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' },
-        { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J' },
-        { 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T' },
-        { 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd' }
-    };
-    unsigned char b[2][5];
-    VGA256ScaleImage((unsigned char *) b, (unsigned char *) image, 5, 2, 10, 4);
+	unsigned short type;             // Magic identifier: 0x4d42
+	unsigned long size;             // File size in bytes
+	unsigned short reserved1;        // Not used
+	unsigned short reserved2;        // Not used
+	unsigned long offset;           // Offset to image data in bytes from beginning of file (54 bytes)
+	unsigned long dib_header_size;  // DIB Header size in bytes (40 bytes)
+	long width_px;         // Width of the image
+	long height_px;        // Height of image
+	unsigned short  num_planes;       // Number of color planes
+	unsigned short  bits_per_pixel;   // Bits per pixel
+	unsigned long  compression;      // Compression type
+	unsigned long  image_size_bytes; // Image size in bytes
+	long x_resolution_ppm; // Pixels per meter
+	long y_resolution_ppm; // Pixels per meter
+	unsigned long  num_colors;       // Number of colors  
+	unsigned long  important_colors; // Important colors 
 
-
-}
+};
+#pragma pack (pop)
+
+
+/*------------------------------------------------------------------------------------------------------- */
+int VGA256LoadBMP(char* filename, unsigned char* dest, unsigned char* pal)
+{
+	int readlen = 0;
+	int infile = -1;
+	struct bmp_header bmp_header;
+	int res = -9;
 
 
+	if ((infile = _open(filename, O_BINARY | O_RDONLY)) == -1)
+	{
+		res = -1;   /* Cannot open */
+	}
+	else
+	{
+		readlen = _read(infile, &bmp_header, sizeof(bmp_header));
+		if ((bmp_header.type == 0x4d42) && (bmp_header.bits_per_pixel == 8) && (bmp_header.num_planes == 1) && (bmp_header.num_colors <= 256) && (bmp_header.compression == 0))
+		{
+			if (pal)
+			{
+				readlen = _read(infile, pal, 3 * 256);
+				/*
+				for (i = 0; i < readlen; i++)
+				{
+					pal[i] = pal[i] >> 2;
+				}
+				*/
+			}
+			if (dest)
+			{
+				_lseek(infile, bmp_header.offset, SEEK_SET);
+				readlen = _read(infile, dest, bmp_header.image_size_bytes);
+			}
+			res = bmp_header.image_size_bytes;
+		}
+		else
+		{
+			res = -2;   /* Invalid PCX */
+		}
+	}
+	if (infile != -1)
+	{
+		_close(infile);
+	}
+	return(res);
+}
+
 
 /*------------------------------------------------------------------------------------------------------- */
-void VGA256ScaleImage(unsigned char* pDest, unsigned char* pSource, unsigned int widthd, unsigned int heightd, unsigned int widths, unsigned int heights)
+void main(int argc, char* argv[])
 {
-    unsigned int h, w;
-    unsigned char pixel;
-    unsigned int runw, runh;
-    unsigned int carryw, carryh;
-    div_t widthr, heightr;
+	unsigned char image[4][10] =
+	{
+		{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' },
+		{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J' },
+		{ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T' },
+		{ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd' }
+	};
+	unsigned char b[2][5];
 
-    heightr = div(heightd, heights);
-    widthr = div(widthd, widths); 
+	unsigned char data[64000];
+	unsigned char pal[768];
+	VGA256LoadBMP("perin.bmp", data, pal);
 
-    runh = 0;
-    carryh = 0;
-    for (h = 0; h < heights; h++)
-    {
-        runh += heightr.quot;
-        carryh += heightr.rem;
-        if (carryh >= heights)
-        {
-            carryh = 0;
-            runh++;
-        }
-        if (runh > 0)
-        {
-            runw = 0;
-            carryw = 0;
-            for (w = 0; w < widths; w++)
-            {
-                runw += widthr.quot;
-                carryw += widthr.rem;
-                if (carryw >= widths)
-                {
-                    carryw = 0;
-                    runw++;
-                }
-                pixel = *pSource;
-                pSource++;
-                while (runw > 0)
-                {
-                    *pDest = pixel;
-                    pDest++;
-                    runw--;
-                }
-            }
-            runh--;
-            while (runh > 0)
-            {
-                memcpy(pDest, pDest - widthd, widthd);
-                pDest += widthd;
-                runh--;
-            }
-        }
-        else
-        {
-            pSource += widths;
-        }
-    }
 }
diff --git a/Source/vga256.c b/Source/vga256.c
@@ -1587,6 +1587,71 @@ int VGA256DecodePCX(unsigned char *dest, unsigned char *buffer)
 }
 
 
+/*------------------------------------------------------------------------------------------------------- */
+#pragma pack (push, 1)
+struct bmp_header
+{
+	unsigned short type;             // Magic identifier: 0x4d42
+	unsigned long size;             // File size in bytes
+	unsigned short reserved1;        // Not used
+	unsigned short reserved2;        // Not used
+	unsigned long offset;           // Offset to image data in bytes from beginning of file (54 bytes)
+	unsigned long dib_header_size;  // DIB Header size in bytes (40 bytes)
+	long width_px;         // Width of the image
+	long height_px;        // Height of image
+	unsigned short  num_planes;       // Number of color planes
+	unsigned short  bits_per_pixel;   // Bits per pixel
+	unsigned long  compression;      // Compression type
+	unsigned long  image_size_bytes; // Image size in bytes
+	long x_resolution_ppm; // Pixels per meter
+	long y_resolution_ppm; // Pixels per meter
+	unsigned long  num_colors;       // Number of colors  
+	unsigned long  important_colors; // Important colors 
+
+};
+#pragma pack (pop)
+
+
+/*------------------------------------------------------------------------------------------------------- */
+int VGA256LoadBMP(char* filename, unsigned char* dest, unsigned char* pal)
+{
+	int infile = -1;
+	struct bmp_header bmp_header;
+	int res = -9;
+
+
+	if ((infile = _open(filename, O_BINARY | O_RDONLY)) == -1)
+	{
+		res = -1;   /* Cannot open */
+	}
+	else
+	{
+		_read(infile, &bmp_header, sizeof(bmp_header));
+		if ((bmp_header.type == 0x4d42) && (bmp_header.bits_per_pixel == 8) && (bmp_header.num_planes == 1) && (bmp_header.num_colors <= 256) && (bmp_header.compression == 0))
+		{
+			if (pal)
+			{
+				_read(infile, pal, 3 * 256);
+			}
+			if (dest)
+			{
+				_lseek(infile, bmp_header.offset, SEEK_SET);
+				_read(infile, dest, bmp_header.image_size_bytes);
+			}
+			res = bmp_header.image_size_bytes;
+		}
+		else
+		{
+			res = -2;   /* Invalid PCX */
+		}
+	}
+	if (infile != -1)
+	{
+		_close(infile);
+	}
+	return(res);
+}
+
 
 
 /*------------------------------------------------------------------------------------------------------- */

diff --git a/Source/vga256.h b/Source/vga256.h
@@ -190,6 +190,7 @@ void VGA256OutText2x(void* pVideo, char* string, unsigned int x_cursor, unsigned
 void VGA256OutText4x(void* pVideo, char* string, unsigned int x_cursor, unsigned int y_cursor, unsigned int color, unsigned char* font);
 int VGA256LoadPCX(char* filename, unsigned char* dest, unsigned char* pal);
 int VGA256DecodePCX(unsigned char* dest, unsigned char* buffer);
+int VGA256LoadBMP(char* filename, unsigned char* dest, unsigned char* pal);
 int VGA256KbHit(void);
 int VGA256GetCh(void);
 

diff --git a/...5c36c16-e18b-4af0-97e0-b4ec6bb10a09.vsidx → ...af79d3b-7469-49a4-ae9f-304737ec3887.vsidx b/...5c36c16-e18b-4af0-97e0-b4ec6bb10a09.vsidx → ...af79d3b-7469-49a4-ae9f-304737ec3887.vsidx
diff --git a/...978e261-3b78-4268-83a4-cd243d3de06d.vsidx → ...5073882-501d-4dcc-b00d-696f349d3e2c.vsidx b/...978e261-3b78-4268-83a4-cd243d3de06d.vsidx → ...5073882-501d-4dcc-b00d-696f349d3e2c.vsidx
diff --git a/_VC/Test/.vs/Test/v17/.suo b/_VC/Test/.vs/Test/v17/.suo
diff --git a/_VC/Test/.vs/Test/v17/Browse.VC.db b/_VC/Test/.vs/Test/v17/Browse.VC.db
diff --git a/_VC/Test/.vs/Test/v17/DocumentLayout.json b/_VC/Test/.vs/Test/v17/DocumentLayout.json
@@ -23,7 +23,7 @@
               "RelativeDocumentMoniker": "..\\..\\Source\\test.c",
               "ToolTip": "D:\\PROYECTOS\\VGA256\\Source\\test.c",
               "RelativeToolTip": "..\\..\\Source\\test.c",
-              "ViewState": "AQIAAAcAAAAAAAAAAAAAABsAAAAAAAAA",
+              "ViewState": "AQIAADUAAAAAAAAAAAAkwFAAAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
               "WhenOpened": "2024-05-11T18:38:58.519Z",
               "EditorCaption": ""

diff --git a/_VC/Test/Test/x64/Debug/Test.ilk b/_VC/Test/Test/x64/Debug/Test.ilk
diff --git a/_VC/Test/Test/x64/Debug/Test.log b/_VC/Test/Test/x64/Debug/Test.log
@@ -1,3 +1,3 @@
   test.c
-D:\PROYECTOS\VGA256\Source\test.c(75,17): warning C4013: 'memcpy' sin definir; se supone que extern devuelve como resultado int
+D:\PROYECTOS\VGA256\Source\test.c(93,16): warning C4101: 'b': variable local sin referencia
   Test.vcxproj -> D:\PROYECTOS\VGA256\_VC\Test\x64\Debug\Test.exe
diff --git a/_VC/Test/Test/x64/Debug/test.obj b/_VC/Test/Test/x64/Debug/test.obj
diff --git a/_VC/Test/Test/x64/Debug/vc143.idb b/_VC/Test/Test/x64/Debug/vc143.idb
diff --git a/_VC/Test/Test/x64/Debug/vc143.pdb b/_VC/Test/Test/x64/Debug/vc143.pdb
diff --git a/_VC/Test/perin.bmp b/_VC/Test/perin.bmp
diff --git a/_VC/Test/perin.pcx b/_VC/Test/perin.pcx
diff --git a/_VC/Test/x64/Debug/Test.exe b/_VC/Test/x64/Debug/Test.exe
diff --git a/_VC/Test/x64/Debug/Test.pdb b/_VC/Test/x64/Debug/Test.pdb
diff --git a/...e6b3596-3de0-4cff-b915-6299819cb403.vsidx → ...2eb870b-9170-4280-be63-39484ea1cfd0.vsidx b/...e6b3596-3de0-4cff-b915-6299819cb403.vsidx → ...2eb870b-9170-4280-be63-39484ea1cfd0.vsidx
diff --git a/...099bb5b-995f-4e56-9c9e-bb8988943089.vsidx → ...a6e09a9-5d6a-4693-a4b6-963e0d6c43f3.vsidx b/...099bb5b-995f-4e56-9c9e-bb8988943089.vsidx → ...a6e09a9-5d6a-4693-a4b6-963e0d6c43f3.vsidx
diff --git a/...6e622d1-4d82-428a-a911-942e57f13b67.vsidx → ...34f3dc6-a836-4cf6-9b24-3522f4005e2b.vsidx b/...6e622d1-4d82-428a-a911-942e57f13b67.vsidx → ...34f3dc6-a836-4cf6-9b24-3522f4005e2b.vsidx
diff --git a/_VC/VGA256/.vs/VGA256/v17/.suo b/_VC/VGA256/.vs/VGA256/v17/.suo
diff --git a/_VC/VGA256/.vs/VGA256/v17/Browse.VC.db b/_VC/VGA256/.vs/VGA256/v17/Browse.VC.db
diff --git a/_VC/VGA256/.vs/VGA256/v17/DocumentLayout.json b/_VC/VGA256/.vs/VGA256/v17/DocumentLayout.json
@@ -12,10 +12,10 @@
       "AbsoluteMoniker": "D:0:0:{6DC0C79A-7147-40F9-87E3-409F203C2E64}|VGA256.vcxproj|D:\\PROYECTOS\\VGA256\\Source\\vga256.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6DC0C79A-7147-40F9-87E3-409F203C2E64}|VGA256.vcxproj|D:\\PROYECTOS\\VGA256\\Source\\data.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{6DC0C79A-7147-40F9-87E3-409F203C2E64}|VGA256.vcxproj|D:\\PROYECTOS\\VGA256\\Source\\data.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6DC0C79A-7147-40F9-87E3-409F203C2E64}|VGA256.vcxproj|D:\\PROYECTOS\\VGA256\\Source\\data.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+      "AbsoluteMoniker": "D:0:0:{6DC0C79A-7147-40F9-87E3-409F203C2E64}|VGA256.vcxproj|D:\\PROYECTOS\\VGA256\\Source\\data.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
     }
   ],
   "DocumentGroupContainers": [
@@ -35,14 +35,13 @@
               "RelativeDocumentMoniker": "..\\..\\Source\\vga256.h",
               "ToolTip": "D:\\PROYECTOS\\VGA256\\Source\\vga256.h",
               "RelativeToolTip": "..\\..\\Source\\vga256.h",
-              "ViewState": "AQIAAKMAAAAAAAAAAAAwwL0AAACIAAAA",
+              "ViewState": "AQIAAKQAAAAAAAAAAAAwwMAAAABLAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|",
-              "WhenOpened": "2024-05-11T03:28:11.846Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-05-11T03:28:11.846Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 4,
+              "DocumentIndex": 3,
               "Title": "data.h",
               "DocumentMoniker": "D:\\PROYECTOS\\VGA256\\Source\\data.h",
               "RelativeDocumentMoniker": "..\\..\\Source\\data.h",
@@ -54,7 +53,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 4,
               "Title": "data.c",
               "DocumentMoniker": "D:\\PROYECTOS\\VGA256\\Source\\data.c",
               "RelativeDocumentMoniker": "..\\..\\Source\\data.c",
@@ -72,7 +71,7 @@
               "RelativeDocumentMoniker": "..\\..\\Source\\main.c",
               "ToolTip": "D:\\PROYECTOS\\VGA256\\Source\\main.c",
               "RelativeToolTip": "..\\..\\Source\\main.c",
-              "ViewState": "AQIAADwAAAAAAAAAAAAAAEYAAAAsAAAA",
+              "ViewState": "AQIAACQAAAAAAAAAAAAAAC8AAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
               "WhenOpened": "2024-05-12T03:38:17.185Z",
               "EditorCaption": ""
@@ -85,7 +84,7 @@
               "RelativeDocumentMoniker": "..\\..\\Source\\vga256.c",
               "ToolTip": "D:\\PROYECTOS\\VGA256\\Source\\vga256.c",
               "RelativeToolTip": "..\\..\\Source\\vga256.c",
-              "ViewState": "AQIAAAoFAAAAAAAAAAAuwCAFAAAvAAAA",
+              "ViewState": "AQIAAFEGAAAAAAAAAAAkwFwGAAACAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
               "WhenOpened": "2024-05-12T08:43:28.903Z",
               "EditorCaption": ""

diff --git a/_VC/VGA256/.vs/VGA256/v17/ipch/AutoPCH/13b3904d063db5f3/VGA256.ipch b/_VC/VGA256/.vs/VGA256/v17/ipch/AutoPCH/13b3904d063db5f3/VGA256.ipch
diff --git a/_VC/VGA256/.vs/VGA256/v17/ipch/AutoPCH/290544db530959e1/MAIN.ipch b/_VC/VGA256/.vs/VGA256/v17/ipch/AutoPCH/290544db530959e1/MAIN.ipch