diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 16:44:42 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 20:47:02 +0000 |
commit | 413fdec1a6d6b42b9a58da45f327c330352318bb (patch) | |
tree | b53636a248d97d1c85bb90516159f133a702e473 /basebmp | |
parent | 6fe8925305dffd2e1d496319f73ef6602363ef7b (diff) |
drop unused basebmp debug file
Change-Id: I96378ef283cc94e7b9b0a9d73a43beda30028447
Diffstat (limited to 'basebmp')
-rw-r--r-- | basebmp/Library_basebmp.mk | 1 | ||||
-rw-r--r-- | basebmp/source/bitmapdevice.cxx | 37 | ||||
-rw-r--r-- | basebmp/source/debug.cxx | 110 |
3 files changed, 0 insertions, 148 deletions
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 3523ddf937c4..62822cb5a5f8 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -48,7 +48,6 @@ endif $(eval $(call gb_Library_add_exception_objects,basebmp,\ basebmp/source/bitmapdevice \ - basebmp/source/debug \ )) # vim: set noet sw=4 ts=4: diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 1e70d1383670..8228f2d60983 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -177,8 +177,6 @@ namespace typedef AccessorTraits< dest_accessor_type > accessor_traits; typedef CompositeIterator2D< dest_iterator_type, mask_iterator_type > composite_iterator_type; - typedef CompositeIterator2D< vigra::Diff2D, - vigra::Diff2D > generic_composite_iterator_type; typedef BitmapRenderer<mask_iterator_type, mask_rawaccessor_type, @@ -506,40 +504,6 @@ namespace rDstRect), isSharedBuffer(rSrcBitmap)); } - - template< typename Iterator, typename Acc > - void implDrawMaskedBitmapGeneric(const BitmapDeviceSharedPtr& rSrcBitmap, - const BitmapDeviceSharedPtr& rMask, - const basegfx::B2IBox& rSrcRect, - const basegfx::B2IBox& rDstRect, - const Iterator& begin, - const Acc& acc) - { - GenericColorImageAccessor aSrcAcc( rSrcBitmap ); - GenericColorImageAccessor aMaskAcc( rMask ); - - const vigra::Diff2D aTopLeft(rSrcRect.getMinX(), - rSrcRect.getMinY()); - const vigra::Diff2D aBottomRight(rSrcRect.getMaxX(), - rSrcRect.getMaxY()); - scaleImage( - vigra::make_triple( - generic_composite_iterator_type( - aTopLeft,aTopLeft), - generic_composite_iterator_type( - aBottomRight,aBottomRight), - joined_generic_image_accessor_type( - aSrcAcc, - aMaskAcc)), - destIterRange(begin, - typename masked_input_splitting_accessor< - Acc, - joined_generic_image_accessor_type, - Masks::clipmask_polarity, - NoFastMask >::type(acc), - rDstRect)); - } - }; } // namespace @@ -1180,7 +1144,6 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector& "createBitmapDevice: " << rSize.getX() << "x" << rSize.getY() << (bTopDown ? " top-down " : " bottom-up ") - << formatName(nScanlineFormat) << subset.str() << " = " << result.get() ); #endif diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx deleted file mode 100644 index f01fd390e1c2..000000000000 --- a/basebmp/source/debug.cxx +++ /dev/null @@ -1,110 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <osl/diagnose.h> - -#include <basegfx/point/b2ipoint.hxx> -#include <basegfx/vector/b2ivector.hxx> - -#include <basebmp/scanlineformats.hxx> -#include <basebmp/color.hxx> -#include <basebmp/bitmapdevice.hxx> -#include <basebmp/debug.hxx> - -#include <iomanip> - -namespace basebmp -{ - const char* formatName( Format nScanlineFormat ) - { - switch( nScanlineFormat ) - { - case Format::NONE: - return "NONE"; - case Format::OneBitMsbGrey: - return "ONE_BIT_MSB_GREY"; - case Format::OneBitLsbGrey: - return "ONE_BIT_LSB_GREY"; - case Format::OneBitMsbPal: - return "ONE_BIT_MSB_PAL"; - case Format::OneBitLsbPal: - return "ONE_BIT_LSB_PAL"; - case Format::FourBitMsbGrey: - return "FOUR_BIT_MSB_GREY"; - case Format::FourBitLsbGrey: - return "FOUR_BIT_LSB_GREY"; - case Format::FourBitMsbPal: - return "FOUR_BIT_MSB_PAL"; - case Format::FourBitLsbPal: - return "FOUR_BIT_LSB_PAL"; - case Format::EightBitPal: - return "EIGHT_BIT_PAL"; - case Format::EightBitGrey: - return "EIGHT_BIT_GREY"; - case Format::SixteenBitLsbTcMask: - return "SIXTEEN_BIT_LSB_TC_MASK"; - case Format::SixteenBitMsbTcMask: - return "SIXTEEN_BIT_MSB_TC_MASK"; - case Format::TwentyFourBitTcMask: - return "TWENTYFOUR_BIT_TC_MASK"; - case Format::ThirtyTwoBitTcMaskBGRA: - return "THIRTYTWO_BIT_TC_MASK_BGRA"; - case Format::ThirtyTwoBitTcMaskARGB: - return "THIRTYTWO_BIT_TC_MASK_ARGB"; - case Format::ThirtyTwoBitTcMaskABGR: - return "THIRTYTWO_BIT_TC_MASK_ABGR"; - case Format::ThirtyTwoBitTcMaskRGBA: - return "THIRTYTWO_BIT_TC_MASK_RGBA"; - default: - return "<unknown>"; - } - } - -#if OSL_DEBUG_LEVEL > 2 - - void debugDump( const BitmapDeviceSharedPtr& rDevice, - std::ostream& rOutputStream ) - { - const basegfx::B2IVector aSize( rDevice->getSize() ); - const bool bTopDown( rDevice->isTopDown() ); - const Format nScanlineFormat( rDevice->getScanlineFormat() ); - - rOutputStream - << "/* basebmp::BitmapDevice content dump */" << std::endl - << "/* Width = " << aSize.getX() << " */" << std::endl - << "/* Height = " << aSize.getY() << " */" << std::endl - << "/* TopDown = " << bTopDown << " */" << std::endl - << "/* Format = " << formatName(nScanlineFormat) << " */" << std::endl - << "/* (dumped entries are already mapped RGBA color values) */" << std::endl - << std::endl; - - rOutputStream << std::hex; - for( int y=0; y<aSize.getY(); ++y ) - { - for( int x=0; x<aSize.getX(); ++x ) - rOutputStream << std::setw(8) << (sal_uInt32)rDevice->getPixel( basegfx::B2IPoint(x,y) ).toInt32() << " "; - rOutputStream << std::endl; - } - } - -#endif // OSL_DEBUG_LEVEL > 2 - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |