summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/ap_dsk35.c8
-rw-r--r--src/lib/util/bitmap.c18
-rw-r--r--src/lib/util/bitmap.h10
3 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index a94d76e95c2..2f6d4d8e292 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -1254,7 +1254,7 @@ const floppy_image_format_t::desc_e dc42_format::mac_gcr[] = {
{ SECTOR_LOOP_END },
{ END },
};
-
+
bool dc42_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
@@ -1317,7 +1317,7 @@ UINT8 dc42_format::gb(const UINT8 *buf, int ts, int &pos, int &wrap)
if(pos == ts) {
pos = 0;
wrap++;
- }
+ }
}
return v;
}
@@ -1397,8 +1397,8 @@ bool dc42_format::save(io_generic *io, floppy_image *image)
UINT8 tr = gcr6bw_tb[h[0]] | (v2 & 1 ? 0x40 : 0x00);
UINT8 se = gcr6bw_tb[h[1]];
UINT8 si = v2 & 0x20 ? 1 : 0;
- // UINT8 ds = v3 & 0x20 ? 1 : 0;
- // UINT8 fmt = v3 & 0x1f;
+ // UINT8 ds = v3 & 0x20 ? 1 : 0;
+ // UINT8 fmt = v3 & 0x1f;
UINT8 c1 = (tr^se^v2^v3) & 0x3f;
UINT8 chk = gcr6bw_tb[h[4]];
if(chk == c1 && tr == track && si == head && se < nsect) {
diff --git a/src/lib/util/bitmap.c b/src/lib/util/bitmap.c
index 46c0757be13..279f931426b 100644
--- a/src/lib/util/bitmap.c
+++ b/src/lib/util/bitmap.c
@@ -59,7 +59,7 @@ const UINT32 BITMAP_ROWBYTES_ALIGN = 128;
//**************************************************************************
//-------------------------------------------------
-// compute_rowpixels - compute an aligned
+// compute_rowpixels - compute an aligned
// rowpixels value
//-------------------------------------------------
@@ -161,7 +161,7 @@ void bitmap_t::allocate(int width, int height, int xslop, int yslop)
// delete any existing stuff
reset();
-
+
// handle empty requests cleanly
if (width <= 0 || height <= 0)
return;
@@ -204,7 +204,7 @@ void bitmap_t::resize(int width, int height, int xslop, int yslop)
int new_rowpixels = compute_rowpixels(width, xslop);
UINT32 new_allocbytes = new_rowpixels * (height + 2 * yslop) * m_bpp / 8;
new_allocbytes += BITMAP_OVERALL_ALIGN - 1;
-
+
// if we need more memory, just realloc
if (new_allocbytes > m_allocbytes)
{
@@ -213,7 +213,7 @@ void bitmap_t::resize(int width, int height, int xslop, int yslop)
set_palette(palette);
return;
}
-
+
// otherwise, reconfigure
m_rowpixels = new_rowpixels;
m_width = width;
@@ -247,7 +247,7 @@ void bitmap_t::reset()
//-------------------------------------------------
-// wrap -- wrap an array of memory; the target
+// wrap -- wrap an array of memory; the target
// bitmap does not own the memory
//-------------------------------------------------
@@ -255,7 +255,7 @@ void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
{
// delete any existing stuff
reset();
-
+
// initialize relevant fields
m_base = base;
m_rowpixels = rowpixels;
@@ -266,8 +266,8 @@ void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
//-------------------------------------------------
-// wrap -- wrap a subrectangle of an existing
-// bitmap by copying its fields; the target
+// wrap -- wrap a subrectangle of an existing
+// bitmap by copying its fields; the target
// bitmap does not own the memory
//-------------------------------------------------
@@ -279,7 +279,7 @@ void bitmap_t::wrap(bitmap_t &source, const rectangle &subrect)
// delete any existing stuff
reset();
-
+
// copy relevant fields
m_base = source.raw_pixptr(subrect.min_y, subrect.min_x);
m_rowpixels = source.m_rowpixels;
diff --git a/src/lib/util/bitmap.h b/src/lib/util/bitmap.h
index a255ac24e89..546f6a73586 100644
--- a/src/lib/util/bitmap.h
+++ b/src/lib/util/bitmap.h
@@ -211,7 +211,7 @@ protected:
public:
// getters
UINT8 bpp() const { return 8; }
-
+
// pixel accessors
typedef UINT8 pixel_t;
pixel_t &pix(INT32 y, INT32 x = 0) const { return pixt<pixel_t>(y, x); }
@@ -234,7 +234,7 @@ protected:
public:
// getters
UINT8 bpp() const { return 16; }
-
+
// pixel accessors
typedef UINT16 pixel_t;
pixel_t &pix(INT32 y, INT32 x = 0) const { return pixt<pixel_t>(y, x); }
@@ -257,7 +257,7 @@ protected:
public:
// getters
UINT8 bpp() const { return 32; }
-
+
// pixel accessors
typedef UINT32 pixel_t;
pixel_t &pix(INT32 y, INT32 x = 0) const { return pixt<pixel_t>(y, x); }
@@ -280,7 +280,7 @@ protected:
public:
// getters
UINT8 bpp() const { return 64; }
-
+
// pixel accessors
typedef UINT64 pixel_t;
pixel_t &pix(INT32 y, INT32 x = 0) const { return pixt<pixel_t>(y, x); }
@@ -294,7 +294,7 @@ public:
class bitmap_ind8 : public bitmap8_t
{
static const bitmap_format k_bitmap_format = BITMAP_FORMAT_IND8;
-
+
public:
// construction/destruction
bitmap_ind8(int width = 0, int height = 0, int xslop = 0, int yslop = 0) : bitmap8_t(k_bitmap_format, width, height, xslop, yslop) { }