liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

render: Rename `register_bitmap_jpeg_3` to `register_bitmap_jpeg_3_or_4` 

It's actually used by both DefineBitsJpeg3 and DefineBitsJpeg4 tags.
This commit is contained in:
relrelb 2021-12-04 14:27:51 +02:00 committed by relrelb
parent 4b587edf7f
commit 00accf3e2a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/backend/render.rs
View File

@ -26,7 +26,7 @@ pub trait RenderBackend: Downcast {
jpeg_tables: Option<&[u8]>,
) -> Result<BitmapInfo, Error>;
fn register_bitmap_jpeg_2(&mut self, data: &[u8]) -> Result<BitmapInfo, Error>;
fn register_bitmap_jpeg_3(
fn register_bitmap_jpeg_3_or_4(
&mut self,
jpeg_data: &[u8],
alpha_data: &[u8],
@ -146,7 +146,7 @@ impl RenderBackend for NullRenderer {
height: 0,
})
}
fn register_bitmap_jpeg_3(
fn register_bitmap_jpeg_3_or_4(
&mut self,
_data: &[u8],
_alpha_data: &[u8],

4
core/src/display_object/movie_clip.rs
View File

@ -2667,7 +2667,7 @@ impl<'gc, 'a> MovieClipData<'gc> {
reader.get_mut().read_exact(&mut alpha_data)?;
let bitmap_info = context
.renderer
.register_bitmap_jpeg_3(&jpeg_data, &alpha_data)?;
.register_bitmap_jpeg_3_or_4(&jpeg_data, &alpha_data)?;
let bitmap = Bitmap::new(
context,
id,
@ -2702,7 +2702,7 @@ impl<'gc, 'a> MovieClipData<'gc> {
reader.get_mut().read_exact(&mut alpha_data)?;
let bitmap_info = context
.renderer
.register_bitmap_jpeg_3(&jpeg_data, &alpha_data)?;
.register_bitmap_jpeg_3_or_4(&jpeg_data, &alpha_data)?;
let bitmap = Bitmap::new(
context,
id,

2
render/canvas/src/lib.rs
View File

@ -490,7 +490,7 @@ impl RenderBackend for WebCanvasRenderBackend {
}
}
fn register_bitmap_jpeg_3(
fn register_bitmap_jpeg_3_or_4(
&mut self,
jpeg_data: &[u8],
alpha_data: &[u8],

2
render/webgl/src/lib.rs
View File

@ -776,7 +776,7 @@ impl RenderBackend for WebGlRenderBackend {
self.register_bitmap(bitmap)
}
fn register_bitmap_jpeg_3(
fn register_bitmap_jpeg_3_or_4(
&mut self,
jpeg_data: &[u8],
alpha_data: &[u8],

2
render/wgpu/src/lib.rs
View File

@ -858,7 +858,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
Ok(self.register_bitmap(bitmap, "JPEG2"))
}
fn register_bitmap_jpeg_3(
fn register_bitmap_jpeg_3_or_4(
&mut self,
jpeg_data: &[u8],
alpha_data: &[u8],