[Qgis-developer] Re: [QGIS Commit] r13631 - in trunk/qgis: src/core/symbology-ng tests/src/core

[Tim Sutton]

Hi

I think this commit misses rendering_benchmark.cpp

CMake Error in tests/src/core/CMakeLists.txt:
  Cannot find source file "rendering_benchmark.cpp".  Tried extensions .c .C
  .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp .hxx .in .txx


-- Build files have been written to: /home/timlinux/dev/cpp/qgis/build
make: *** [cmake_check_build_system] Error 1

Can anyone else replicate?

Regards

Tim

On Thu, Jun 3, 2010 at 12:49 PM,  <svn_qgis at osgeo.org> wrote:
> Author: wonder
> Date: 2010-06-03 06:49:26 -0400 (Thu, 03 Jun 2010)
> New Revision: 13631
>
> Modified:
>   trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
>   trunk/qgis/tests/src/core/CMakeLists.txt
> Log:
> Fixed #2744
>
>
> Modified: trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
> ===================================================================
> --- trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.cpp   2010-06-03 10:24:53 UTC (rev 13630)
> +++ trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.cpp   2010-06-03 10:49:26 UTC (rev 13631)
> @@ -52,6 +52,14 @@
>  {
>   mColor.setAlphaF( context.alpha() );
>   mBrush = QBrush( mColor, mBrushStyle );
> +
> +  // scale brush content for printout
> +  double rasterScaleFactor = context.renderContext().rasterScaleFactor();
> +  if ( rasterScaleFactor != 1.0 )
> +  {
> +    mBrush.setMatrix( QMatrix().scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor ) );
> +  }
> +
>   QColor selColor = context.selectionColor();
>   // selColor.setAlphaF( context.alpha() );
>   mSelBrush = QBrush( selColor );
>
> Modified: trunk/qgis/tests/src/core/CMakeLists.txt
> ===================================================================
> --- trunk/qgis/tests/src/core/CMakeLists.txt    2010-06-03 10:24:53 UTC (rev 13630)
> +++ trunk/qgis/tests/src/core/CMakeLists.txt    2010-06-03 10:49:26 UTC (rev 13631)
> @@ -7,8 +7,11 @@
>  # the UI file won't be wrapped!
>  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
>   ${CMAKE_CURRENT_BINARY_DIR}
> -  ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
> -  ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
> +  ${CMAKE_SOURCE_DIR}/src/core
> +  ${CMAKE_SOURCE_DIR}/src/core/raster
> +  ${CMAKE_SOURCE_DIR}/src/core/renderer
> +  ${CMAKE_SOURCE_DIR}/src/core/symbology
> +  ${CMAKE_SOURCE_DIR}/src/core/symbology-ng
>   ${QT_INCLUDE_DIR}
>   ${GDAL_INCLUDE_DIR}
>   ${PROJ_INCLUDE_DIR}
> @@ -113,3 +116,6 @@
>  ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
>  ADD_QGIS_TEST(pointtest testqgspoint.cpp)
>  ADD_QGIS_TEST(searchstringtest testqgssearchstring.cpp)
> +
> +ADD_QGIS_TEST(renderingbenchmark rendering_benchmark.cpp)
> +
>
> _______________________________________________
> QGIS-commit mailing list
> QGIS-commit at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-commit
>



-- 
Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)
==============================================
Please do not email me off-list with technical
support questions. Using the lists will gain
more exposure for your issues and the knowledge
surrounding your issue will be shared with all.

Visit http://linfiniti.com to find out about:
 * QGIS programming and support services
 * Mapserver and PostGIS based hosting plans
 * FOSS Consulting Services
Skype: timlinux
Irc: timlinux on #qgis at freenode.net
==============================================