From kde-kimageshop Sun Mar 20 18:44:06 2011 From: Dmitry Kazakov Date: Sun, 20 Mar 2011 18:44:06 +0000 To: kde-kimageshop Subject: =?utf-8?q?=5Bcalligra=5D_/=3A_Merge_branch_=27krita-bounded-pool?= Message-Id: <20110320184406.CE039A609B () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-kimageshop&m=130064670311105 Git commit 21b3d21808ae4d24f611acd9a8f0dd1adbbfc66d by Dmitry Kazakov. Committed on 20/03/2011 at 19:41. Pushed by dkazakov into branch 'master'. Merge branch 'krita-bounded-pooler-kazakov' It would be a really good idea to perform 'make clean' in ./krita/image/ folder CCMAIL:kimageshop@kde.org I +19 -4 krita/image/kis_image_config.cpp I +5 -2 krita/image/kis_image_config.h I +12 -1 krita/image/tiles3/kis_lockless_stack.h I +1 -6 krita/image/tiles3/kis_tile_data.cc I +12 -1 krita/image/tiles3/kis_tile_data.h I +2 -1 krita/image/tiles3/kis_tile_data_interface.h I +168 -26 krita/image/tiles3/kis_tile_data_pooler.cc I +19 -3 krita/image/tiles3/kis_tile_data_pooler.h I +43 -8 krita/image/tiles3/kis_tile_data_store.cc I +13 -1 krita/image/tiles3/kis_tile_data_store.h I +2 -7 krita/image/tiles3/swap/kis_tile_data_swapper_p.h I +5 -0 krita/image/tiles3/tests/CMakeLists.txt I +12 -16 krita/image/tiles3/tests/kis_lockless_stack_test.cpp I +6 -4 krita/image/tiles3/tests/kis_store_limits_test.cpp I +111 -0 krita/image/tiles3/tests/kis_tile_data_pooler_test.cpp I +32 -0 krita/image/tiles3/tests/kis_tile_data_pooler_test.h I +57 -0 krita/image/tiles3/tests/kis_tiled_data_manager_test.cpp I +5 -0 krita/image/tiles3/tests/kis_tiled_data_manager_test.h http://commits.kde.org/calligra/21b3d21808ae4d24f611acd9a8f0dd1adbbfc66d _______________________________________________ kimageshop mailing list kimageshop@kde.org https://mail.kde.org/mailman/listinfo/kimageshop