From d0abc13c9442b69f56114624fc444b023ecf42df Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 30 Nov 2014 22:09:21 +0000 Subject: [PATCH] Pass gr_create_sub_bitmap arg by & --- common/2d/bitmap.cpp | 4 ++-- common/include/gr.h | 2 +- similar/main/gauges.cpp | 4 ++-- similar/main/newmenu.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/2d/bitmap.cpp b/common/2d/bitmap.cpp index f14081649..cbcabc0c9 100644 --- a/common/2d/bitmap.cpp +++ b/common/2d/bitmap.cpp @@ -94,10 +94,10 @@ void gr_init_bitmap_data (grs_bitmap &bm) // TODO: virtulize #endif } -grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap *bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h ) +grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap &bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h) { grs_subbitmap_ptr n(new grs_bitmap); - gr_init_sub_bitmap(*n.get(), *bm, x, y, w, h); + gr_init_sub_bitmap(*n.get(), bm, x, y, w, h); return n; } diff --git a/common/include/gr.h b/common/include/gr.h index 15ac647c4..fc313c175 100644 --- a/common/include/gr.h +++ b/common/include/gr.h @@ -254,7 +254,7 @@ struct subbitmap_delete : private std::default_delete typedef std::unique_ptr grs_subbitmap_ptr; // Creates a bitmap which is part of another bitmap -grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap *bm,uint16_t x,uint16_t y,uint16_t w, uint16_t h); +grs_subbitmap_ptr gr_create_sub_bitmap(grs_bitmap &bm, uint16_t x, uint16_t y, uint16_t w, uint16_t h); // Free the bitmap's data void gr_free_bitmap_data (grs_bitmap &bm); diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index 178aec707..3fbd78eb1 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -1806,8 +1806,8 @@ static void cockpit_decode_alpha(grs_bitmap *bm) #ifdef OGL ogl_ubitmapm_cs (0, 0, -1, -1, deccpt, 255, F1_0); // render one time to init the texture #endif - WinBoxOverlay[0] = gr_create_sub_bitmap(&deccpt,(PRIMARY_W_BOX_LEFT)-2,(PRIMARY_W_BOX_TOP)-2,(PRIMARY_W_BOX_RIGHT-PRIMARY_W_BOX_LEFT+4),(PRIMARY_W_BOX_BOT-PRIMARY_W_BOX_TOP+4)); - WinBoxOverlay[1] = gr_create_sub_bitmap(&deccpt,(SECONDARY_W_BOX_LEFT)-2,(SECONDARY_W_BOX_TOP)-2,(SECONDARY_W_BOX_RIGHT-SECONDARY_W_BOX_LEFT)+4,(SECONDARY_W_BOX_BOT-SECONDARY_W_BOX_TOP)+4); + WinBoxOverlay[0] = gr_create_sub_bitmap(deccpt,(PRIMARY_W_BOX_LEFT)-2,(PRIMARY_W_BOX_TOP)-2,(PRIMARY_W_BOX_RIGHT-PRIMARY_W_BOX_LEFT+4),(PRIMARY_W_BOX_BOT-PRIMARY_W_BOX_TOP+4)); + WinBoxOverlay[1] = gr_create_sub_bitmap(deccpt,(SECONDARY_W_BOX_LEFT)-2,(SECONDARY_W_BOX_TOP)-2,(SECONDARY_W_BOX_RIGHT-SECONDARY_W_BOX_LEFT)+4,(SECONDARY_W_BOX_BOT-SECONDARY_W_BOX_TOP)+4); cur = bm->bm_data; cur_w = bm->bm_w; diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index b540809fd..0cdbc5002 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -183,7 +183,7 @@ void nm_draw_background(int x1, int y1, int x2, int y2 ) init_sub=1; } if (init_sub) - nm_background_sub = gr_create_sub_bitmap(&nm_background,0,0,w*(((float) nm_background.bm_w)/SWIDTH),h*(((float) nm_background.bm_h)/SHEIGHT)); + nm_background_sub = gr_create_sub_bitmap(nm_background,0,0,w*(((float) nm_background.bm_w)/SWIDTH),h*(((float) nm_background.bm_h)/SHEIGHT)); show_fullscr( nm_background_sub.get() ); gr_set_current_canvas(old);