- Drop patches accepted upstream
- Drop previously backported patches
- Drop obsolete patches
- Enable hadoop/hdfs support for all architectures
* libhdfs is now available for more architectures than ix86 and x86_64
- Enable building on aarch64
- Rename the python packages to python2-root and python3-root
- New sub-packages: python{2,3}-jupyroot, python{2,3}-jsmva
- Dropped sub-package: root-rootaas (replaced by python{2,3}-jupyroot)
27 lines
942 B
Diff
27 lines
942 B
Diff
diff --git a/tutorials/image/rose_image.C b/tutorials/image/rose_image.C
|
|
index 0614406..4e1b905 100644
|
|
--- a/tutorials/image/rose_image.C
|
|
+++ b/tutorials/image/rose_image.C
|
|
@@ -20,7 +20,9 @@ TCanvas *c1;
|
|
|
|
void rose_image()
|
|
{
|
|
- TImage *img = TImage::Open("$ROOTSYS/tutorials/image/rose512.jpg");
|
|
+ TString dir = TROOT::GetTutorialDir();
|
|
+
|
|
+ TImage *img = TImage::Open(dir + "/image/rose512.jpg");
|
|
|
|
if (!img) {
|
|
printf("Could not create an image... exit\n");
|
|
@@ -41,9 +43,9 @@ void rose_image()
|
|
|
|
// draw text over image with foreground specified by pixmap
|
|
img->DrawText(250, 350, "goodbye cruel world ...", 24, 0,
|
|
- ar, TImage::kPlain, "fore.xpm");
|
|
+ ar, TImage::kPlain, dir + "/image/fore.xpm");
|
|
|
|
- TImage *img2 = TImage::Open("mditestbg.xpm");
|
|
+ TImage *img2 = TImage::Open(dir + "/image/mditestbg.xpm");
|
|
|
|
// tile image
|
|
img2->Tile(img->GetWidth(), img->GetHeight());
|