Skip to content

Commit

Permalink
Fixed "taking the address of a temporary object" warnings.
Browse files Browse the repository at this point in the history
BUG=224532
TBR=timurrrr

Review URL: https://chromiumcodereview.appspot.com/13149002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191143 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
vitalybuka@chromium.org committed Mar 28, 2013
1 parent 81d459d commit 6c1d947
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions printing/emf_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ class RasterBitmap {
NOTREACHED() << "Raster bitmap creation for printing failed";

saved_object_ = ::SelectObject(context_, bitmap_);
::FillRect(context_, &bitmap_rect.ToRECT(),
RECT rect = bitmap_rect.ToRECT();
::FillRect(context_, &rect,
static_cast<HBRUSH>(::GetStockObject(WHITE_BRUSH)));

}
Expand Down Expand Up @@ -229,11 +230,12 @@ bool Emf::SafePlayback(HDC context) const {
}
Emf::EnumerationContext playback_context;
playback_context.base_matrix = &base_matrix;
RECT rect = GetPageBounds(1).ToRECT();
return EnumEnhMetaFile(context,
emf_,
&Emf::SafePlaybackProc,
reinterpret_cast<void*>(&playback_context),
&GetPageBounds(1).ToRECT()) != 0;
&rect) != 0;
}

gfx::Rect Emf::GetPageBounds(unsigned int page_number) const {
Expand Down Expand Up @@ -615,7 +617,8 @@ Emf* Emf::RasterizeMetafile(int raster_area_in_pixels) const {
RasterBitmap bitmap(page_size);

gfx::Rect bitmap_rect(page_size);
Playback(bitmap.context(), &bitmap_rect.ToRECT());
RECT rect = bitmap_rect.ToRECT();
Playback(bitmap.context(), &rect);

scoped_ptr<Emf> result(new Emf);
result->Init();
Expand Down Expand Up @@ -663,8 +666,8 @@ Emf* Emf::RasterizeAlphaBlend() const {
skia::InitializeDC(hdc);

HDC bitmap_dc = bitmap.context();
::EnumEnhMetaFile(hdc, emf(), &RasterizeAlphaBlendProc, &bitmap_dc,
&page_bounds.ToRECT());
RECT rect = page_bounds.ToRECT();
::EnumEnhMetaFile(hdc, emf(), &RasterizeAlphaBlendProc, &bitmap_dc, &rect);

result->FinishDocument();

Expand Down

0 comments on commit 6c1d947

Please sign in to comment.