1337d80cdf
This contains fixes for the following sorts of issues: * Assignment inside conditional * Possibly-uninitialized local variable * Signedness mismatch This also contains a small number of other cleanups/simplifications to nearby code. BUG=81439 TEST=none R=teravest@chromium.org Review URL: https://codereview.chromium.org/375133003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282133 0039d316-1c4b-4281-b951-d872f2087c98
104 lines
2.8 KiB
C++
104 lines
2.8 KiB
C++
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "ppapi/cpp/image_data.h"
|
|
|
|
#include <string.h> // Needed for memset.
|
|
|
|
#include <algorithm>
|
|
|
|
#include "ppapi/cpp/instance_handle.h"
|
|
#include "ppapi/cpp/module.h"
|
|
#include "ppapi/cpp/module_impl.h"
|
|
|
|
namespace pp {
|
|
|
|
namespace {
|
|
|
|
template <> const char* interface_name<PPB_ImageData_1_0>() {
|
|
return PPB_IMAGEDATA_INTERFACE_1_0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ImageData::ImageData() : data_(NULL) {
|
|
memset(&desc_, 0, sizeof(PP_ImageDataDesc));
|
|
}
|
|
|
|
ImageData::ImageData(const ImageData& other)
|
|
: Resource(other),
|
|
desc_(other.desc_),
|
|
data_(other.data_) {
|
|
}
|
|
|
|
ImageData::ImageData(PassRef, PP_Resource resource)
|
|
: Resource(PASS_REF, resource),
|
|
data_(NULL) {
|
|
memset(&desc_, 0, sizeof(PP_ImageDataDesc));
|
|
InitData();
|
|
}
|
|
|
|
ImageData::ImageData(const InstanceHandle& instance,
|
|
PP_ImageDataFormat format,
|
|
const Size& size,
|
|
bool init_to_zero)
|
|
: data_(NULL) {
|
|
memset(&desc_, 0, sizeof(PP_ImageDataDesc));
|
|
|
|
if (!has_interface<PPB_ImageData_1_0>())
|
|
return;
|
|
|
|
PassRefFromConstructor(get_interface<PPB_ImageData_1_0>()->Create(
|
|
instance.pp_instance(), format, &size.pp_size(),
|
|
PP_FromBool(init_to_zero)));
|
|
InitData();
|
|
}
|
|
|
|
ImageData& ImageData::operator=(const ImageData& other) {
|
|
Resource::operator=(other);
|
|
desc_ = other.desc_;
|
|
data_ = other.data_;
|
|
return *this;
|
|
}
|
|
|
|
const uint32_t* ImageData::GetAddr32(const Point& coord) const {
|
|
// Prefer evil const casts rather than evil code duplication.
|
|
return const_cast<ImageData*>(this)->GetAddr32(coord);
|
|
}
|
|
|
|
uint32_t* ImageData::GetAddr32(const Point& coord) {
|
|
// If we add more image format types that aren't 32-bit, we'd want to check
|
|
// here and fail.
|
|
return reinterpret_cast<uint32_t*>(
|
|
&static_cast<char*>(data())[coord.y() * stride() + coord.x() * 4]);
|
|
}
|
|
|
|
// static
|
|
bool ImageData::IsImageDataFormatSupported(PP_ImageDataFormat format) {
|
|
if (!has_interface<PPB_ImageData_1_0>())
|
|
return false;
|
|
return PP_ToBool(get_interface<PPB_ImageData_1_0>()->
|
|
IsImageDataFormatSupported(format));
|
|
}
|
|
|
|
// static
|
|
PP_ImageDataFormat ImageData::GetNativeImageDataFormat() {
|
|
if (!has_interface<PPB_ImageData_1_0>())
|
|
return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure.
|
|
return get_interface<PPB_ImageData_1_0>()->GetNativeImageDataFormat();
|
|
}
|
|
|
|
void ImageData::InitData() {
|
|
if (!has_interface<PPB_ImageData_1_0>())
|
|
return;
|
|
if (get_interface<PPB_ImageData_1_0>()->Describe(pp_resource(), &desc_)) {
|
|
data_ = get_interface<PPB_ImageData_1_0>()->Map(pp_resource());
|
|
if (data_)
|
|
return;
|
|
}
|
|
*this = ImageData();
|
|
}
|
|
|
|
} // namespace pp
|