@@ -1,5 +1,7 @@

 CHANGES IN VERSION 1.3.14

 ------------------------

+ o offset works in `align=FFALSE` with `annotation_image` function <2016-02-23, Tue>

+   + see https://github.com/GuangchuangYu/ggtree/issues/46

  o subview and inset now supports annotating with img files <2016-02-23, Tue>

 CHANGES IN VERSION 1.3.13

@@ -136,10 +136,6 @@ annotation_image <- function(tree_view, img_info, width=0.1, align=TRUE, linetyp

     x <- df[idx, "x"]

     y <- df[idx, "y"]

-    EBImage <- "EBImage"

-    require(EBImage, character.only = TRUE)

-    readImage <- eval(parse(text="readImage"))

-    

     images <- lapply(img_info[,2], readImage)

     ARs <- sapply(images, getAR)

@@ -148,11 +144,11 @@ annotation_image <- function(tree_view, img_info, width=0.1, align=TRUE, linetyp

     if (align) {

         xmin <- max(df$x) + offset

         xmin <- rep(xmin, length(x))

-        xmax <- xmin + width

     } else {

-        xmin <- x - width/2

-        xmax <- x + width/2

+        xmin <- x - width/2 + offset

     }

+    xmax <- xmin + width

+    

     ymin <- y - ARs * width/2

     ymax <- y + ARs * width/2

     image_layers <- lapply(1:length(xmin), function(i) {

@@ -30,10 +30,7 @@ subview <- function(mainview, subview, x, y, width=.1, height=.1) {

     } else if (is(subview, "grob")) {

         sv <- subview

     } else if (file.exists(subview)) {

-            EBImage <- "EBImage"

-            require(EBImage, character.only = TRUE)

-            readImage <- eval(parse(text="readImage"))

-            sv <- rasterGrob(readImage(subview))

+        sv <- rasterGrob(readImage(subview))

     } else {

         stop("subview should be a ggplot or grob object, or an image file...")

     }

@@ -475,6 +475,9 @@ getCols <- function (n) {

     colorRampPalette(col3)(n)

 }

-

-

-

+readImage <- function(...) {

+    EBImage <- "EBImage"

+    require(EBImage, character.only = TRUE)

+    EBImage_readImage <- eval(parse(text="readImage"))

+    EBImage_readImage(...)

+}