summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-05-25 08:19:21 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-05-25 08:19:21 +0200
commit68785dccfee3208163c8169abc5c6d01becf36d4 (patch)
treed6967331fd0e938981777aa32b5f246e04fb701b /src/emu
parentc1230f8b9bf4373d396ecb970c966ec2ce6dfc15 (diff)
Cleanups and version bumpmame0174
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/digfx.h4
-rw-r--r--src/emu/screen.cpp24
2 files changed, 14 insertions, 14 deletions
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index 2883f71acd0..d41d8d1dd99 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -71,8 +71,8 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
#define STEP1024(START,STEP) STEP512(START,STEP),STEP512((START)+512*(STEP),STEP)
#define STEP2048(START,STEP) STEP1024(START,STEP),STEP1024((START)+1024*(STEP),STEP)
-#define STEP2_INV(START,STEP) (START)+(STEP),(START)
-#define STEP4_INV(START,STEP) STEP2_INV(START+2*STEP,STEP),STEP2_INV(START,STEP)
+#define STEP2_INV(START,STEP) (START)+(STEP),(START)
+#define STEP4_INV(START,STEP) STEP2_INV(START+2*STEP,STEP),STEP2_INV(START,STEP)
//**************************************************************************
// GRAPHICS INFO MACROS
diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp
index e9d22a75c22..0e298148d13 100644
--- a/src/emu/screen.cpp
+++ b/src/emu/screen.cpp
@@ -134,7 +134,7 @@ screen_device_svg_renderer::screen_device_svg_renderer(memory_region *region)
w = 1920;
h = (w / ar) + 0.5;
}
-
+
printf("\n\nMCFG_SCREEN_SIZE(%d, %d)\nMCFG_SCREEN_VISIBLE_AREA(0, %d-1, 0, %d-1)\n", w, h, w, h);
#endif
}
@@ -353,7 +353,7 @@ void screen_device_svg_renderer::compute_diff_image(const std::vector<UINT32> &r
dst++;
}
}
-
+
}
bool screen_device_svg_renderer::compute_mask_intersection_bbox(int key1, int key2, bbox &bb) const
@@ -361,9 +361,9 @@ bool screen_device_svg_renderer::compute_mask_intersection_bbox(int key1, int ke
const cached_bitmap &c1 = m_cache[key1];
const cached_bitmap &c2 = m_cache[key2];
if(c1.x >= c2.x + c2.sx ||
- c1.x + c1.sx <= c2.x ||
- c1.y >= c2.y + c2.sy ||
- c1.y + c1.sy <= c2.y)
+ c1.x + c1.sx <= c2.x ||
+ c1.y >= c2.y + c2.sy ||
+ c1.y + c1.sy <= c2.y)
return false;
int cx0 = c1.x > c2.x ? c1.x : c2.x;
int cy0 = c1.y > c2.y ? c1.y : c2.y;
@@ -412,7 +412,7 @@ void screen_device_svg_renderer::compute_dual_diff_image(const std::vector<UINT3
dest.sx = bb.x1 - bb.x0 + 1;
dest.sy = bb.y1 - bb.y0 + 1;
dest.image.resize(dest.sx*dest.sy);
- for(int y = 0; y != dest.sy; y++) {
+ for(int y = 0; y != dest.sy; y++) {
const UINT32 *psrc1 = &src1.image[(dest.x - src1.x) + src1.sx * (y + dest.y - src1.y)];
const UINT32 *psrc2 = &src2.image[(dest.x - src2.x) + src2.sx * (y + dest.y - src2.y)];
const UINT32 *psrcr = &rend [ dest.x + m_sx * (y + dest.y )];
@@ -457,9 +457,9 @@ void screen_device_svg_renderer::rebuild_cache()
for(int okey : doing) {
// The bounding boxes include x1/y1, so the comparisons must be strict
if(!(bboxes[key].x0 > bboxes[okey].x1 ||
- bboxes[key].x1 < bboxes[okey].x0 ||
- bboxes[key].y0 > bboxes[okey].y1 ||
- bboxes[key].y1 < bboxes[okey].y0))
+ bboxes[key].x1 < bboxes[okey].x0 ||
+ bboxes[key].y0 > bboxes[okey].y1 ||
+ bboxes[key].y1 < bboxes[okey].y0))
goto conflict;
}
doing.push_back(key);
@@ -511,9 +511,9 @@ void screen_device_svg_renderer::rebuild_cache()
for(int okey : doing) {
// The bounding boxes include x1/y1, so the comparisons must be strict
if(!(bboxes[key].x0 > bboxes[okey].x1 ||
- bboxes[key].x1 < bboxes[okey].x0 ||
- bboxes[key].y0 > bboxes[okey].y1 ||
- bboxes[key].y1 < bboxes[okey].y0))
+ bboxes[key].x1 < bboxes[okey].x0 ||
+ bboxes[key].y0 > bboxes[okey].y1 ||
+ bboxes[key].y1 < bboxes[okey].y0))
goto conflict2;
}
doing.push_back(key);